chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: avoid duplication of macro definition
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 69d598b4d3b01e4596f5d3694d7246f38c4d997b..ca8e339b5ae71eff406da71b9743287be36fb333 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-746,12
+746,14
@@
libsystemd_shared_la_SOURCES = \
src/shared/securebits.h \
src/shared/special.h \
src/shared/list.h \
src/shared/securebits.h \
src/shared/special.h \
src/shared/list.h \
+ src/shared/unaligned.h \
src/shared/macro.h \
src/shared/def.h \
src/shared/sparse-endian.h \
src/shared/refcnt.h \
src/shared/udev-util.h \
src/shared/bus-errors.h \
src/shared/macro.h \
src/shared/def.h \
src/shared/sparse-endian.h \
src/shared/refcnt.h \
src/shared/udev-util.h \
src/shared/bus-errors.h \
+ src/shared/bus-errors.c \
src/shared/device-nodes.c \
src/shared/device-nodes.h \
src/shared/util.c \
src/shared/device-nodes.c \
src/shared/device-nodes.h \
src/shared/util.c \
@@
-774,7
+776,6
@@
libsystemd_shared_la_SOURCES = \
src/shared/hashmap.h \
src/shared/siphash24.c \
src/shared/siphash24.h \
src/shared/hashmap.h \
src/shared/siphash24.c \
src/shared/siphash24.h \
- src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
@@
-860,8
+861,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/audit.h \
src/shared/xml.c \
src/shared/xml.h \
src/shared/audit.h \
src/shared/xml.c \
src/shared/xml.h \
- src/shared/condition
-util
.c \
- src/shared/condition
-util
.h \
+ src/shared/condition.c \
+ src/shared/condition.h \
src/shared/bus-label.c \
src/shared/bus-label.h \
src/shared/gpt.h \
src/shared/bus-label.c \
src/shared/bus-label.h \
src/shared/gpt.h \
@@
-1131,8
+1132,6
@@
libsystemd_core_la_SOURCES = \
src/core/mount-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
src/core/mount-setup.h \
src/core/loopback-setup.h \
src/core/loopback-setup.c \
- src/core/condition.c \
- src/core/condition.h \
src/core/namespace.c \
src/core/namespace.h \
src/core/build.h \
src/core/namespace.c \
src/core/namespace.h \
src/core/build.h \
@@
-1322,6
+1321,7
@@
tests += \
test-env-replace \
test-strbuf \
test-strv \
test-env-replace \
test-strbuf \
test-strv \
+ test-path \
test-path-util \
test-strxcpyx \
test-unit-name \
test-path-util \
test-strxcpyx \
test-unit-name \
@@
-1347,6
+1347,7
@@
tests += \
test-hashmap \
test-set \
test-list \
test-hashmap \
test-set \
test-list \
+ test-unaligned \
test-tables \
test-device-nodes \
test-xml \
test-tables \
test-device-nodes \
test-xml \
@@
-1357,9
+1358,11
@@
tests += \
test-capability \
test-async \
test-ratelimit \
test-capability \
test-async \
test-ratelimit \
- test-condition
-util
\
+ test-condition \
test-uid-range \
test-uid-range \
- test-bus-policy
+ test-bus-policy \
+ test-locale-util \
+ test-copy
EXTRA_DIST += \
test/a.service \
EXTRA_DIST += \
test/a.service \
@@
-1503,13
+1506,26
@@
test_async_SOURCES = \
test_async_LDADD = \
libsystemd-shared.la
test_async_LDADD = \
libsystemd-shared.la
-test_
condition
_util_SOURCES = \
- src/test/test-
condition
-util.c
+test_
locale
_util_SOURCES = \
+ src/test/test-
locale
-util.c
-test_condition_util_LDADD = \
- libsystemd-shared.la \
- libsystemd-internal.la
+test_locale_util_LDADD = \
+ libsystemd-shared.la
+
+test_copy_SOURCES = \
+ src/test/test-copy.c
+
+test_copy_LDADD = \
+ libsystemd-shared.la
+test_condition_SOURCES = \
+ src/test/test-condition.c
+
+test_condition_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-internal.la \
+ libsystemd-capability.la \
+ libsystemd-label.la
test_fdset_SOURCES = \
src/test/test-fdset.c
test_fdset_SOURCES = \
src/test/test-fdset.c
@@
-1527,6
+1543,7
@@
test_util_SOURCES = \
src/test/test-util.c
test_util_LDADD = \
src/test/test-util.c
test_util_LDADD = \
+ -lm \
libsystemd-core.la
test_uid_range_SOURCES = \
libsystemd-core.la
test_uid_range_SOURCES = \
@@
-1611,6
+1628,12
@@
test_xml_LDADD = \
test_list_SOURCES = \
src/test/test-list.c
test_list_SOURCES = \
src/test/test-list.c
+test_unaligned_LDADD = \
+ libsystemd-core.la
+
+test_unaligned_SOURCES = \
+ src/test/test-unaligned.c
+
test_list_LDADD = \
libsystemd-core.la
test_list_LDADD = \
libsystemd-core.la
@@
-1742,8
+1765,7
@@
test_cgroup_mask_SOURCES = \
src/test/test-cgroup-mask.c
test_cgroup_mask_CPPFLAGS = \
src/test/test-cgroup-mask.c
test_cgroup_mask_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+ $(AM_CPPFLAGS)
test_cgroup_mask_CFLAGS = \
$(AM_CFLAGS) \
test_cgroup_mask_CFLAGS = \
$(AM_CFLAGS) \
@@
-1787,6
+1809,15
@@
test_path_util_SOURCES = \
test_path_util_LDADD = \
libsystemd-shared.la
test_path_util_LDADD = \
libsystemd-shared.la
+test_path_SOURCES = \
+ src/test/test-path.c
+
+test_path_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_path_LDADD = \
+ libsystemd-core.la
+
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
@@
-1812,8
+1843,7
@@
test_sched_prio_SOURCES = \
src/test/test-sched-prio.c
test_sched_prio_CPPFLAGS = \
src/test/test-sched-prio.c
test_sched_prio_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+ $(AM_CPPFLAGS)
test_sched_prio_CFLAGS = \
$(AM_CFLAGS) \
test_sched_prio_CFLAGS = \
$(AM_CFLAGS) \
@@
-2593,8
+2623,7
@@
libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-network/network-util.c
nodist_libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-network/network-util.c
nodist_libsystemd_internal_la_SOURCES = \
- src/libsystemd/libsystemd.sym \
- src/libsystemd/sd-bus/bus-error-mapping.c
+ src/libsystemd/libsystemd.sym
libsystemd_internal_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_internal_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-2632,13
+2661,11
@@
noinst_LTLIBRARIES += \
EXTRA_DIST += \
src/libsystemd/libsystemd.sym.m4 \
src/libsystemd/libsystemd.pc.in \
EXTRA_DIST += \
src/libsystemd/libsystemd.sym.m4 \
src/libsystemd/libsystemd.pc.in \
- src/libsystemd/sd-bus/bus-error-mapping.gperf \
src/libsystemd/sd-bus/DIFFERENCES \
src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
CLEANFILES += \
src/libsystemd/sd-bus/DIFFERENCES \
src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
CLEANFILES += \
- src/libsystemd/libsystemd.sym \
- src/libsystemd/sd-bus/bus-error-mapping.c
+ src/libsystemd/libsystemd.sym
BUILT_SOURCES += \
src/libsystemd/libsystemd.sym
BUILT_SOURCES += \
src/libsystemd/libsystemd.sym
@@
-2939,6
+2966,7
@@
libsystemd_network_la_SOURCES = \
src/systemd/sd-icmp6-nd.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
src/systemd/sd-icmp6-nd.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
+ src/systemd/sd-pppoe.h \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
src/libsystemd-network/sd-dhcp-client.c \
src/libsystemd-network/sd-dhcp-server.c \
src/libsystemd-network/dhcp-network.c \
@@
-2953,6
+2981,7
@@
libsystemd_network_la_SOURCES = \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
src/libsystemd-network/ipv4ll-internal.h \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/sd-pppoe.c \
src/libsystemd-network/network-internal.c \
src/libsystemd-network/network-internal.h \
src/libsystemd-network/sd-icmp6-nd.c \
src/libsystemd-network/network-internal.c \
src/libsystemd-network/network-internal.h \
src/libsystemd-network/sd-icmp6-nd.c \
@@
-3012,6
+3041,14
@@
test_ipv4ll_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
libsystemd-internal.la \
libsystemd-shared.la
+test_pppoe_SOURCES = \
+ src/systemd/sd-pppoe.h \
+ src/libsystemd-network/test-pppoe.c
+
+test_pppoe_LDADD = \
+ libsystemd-network.la \
+ libsystemd-shared.la
+
test_icmp6_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
test_icmp6_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-icmp6-nd.h \
@@
-3041,6
+3078,9
@@
tests += \
test-icmp6-rs \
test-dhcp6-client
test-icmp6-rs \
test-dhcp6-client
+manual_tests += \
+ test-pppoe
+
# ------------------------------------------------------------------------------
if ENABLE_TERMINAL
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
if ENABLE_TERMINAL
noinst_LTLIBRARIES += \
@@
-3454,7
+3494,8
@@
systemd_udevd_SOURCES = \
src/udev/udevd.c
systemd_udevd_LDADD = \
src/udev/udevd.c
systemd_udevd_LDADD = \
- libudev-core.la
+ libudev-core.la \
+ libsystemd-capability.la
udevadm_SOURCES = \
src/udev/udevadm.c \
udevadm_SOURCES = \
src/udev/udevadm.c \
@@
-3468,7
+3509,8
@@
udevadm_SOURCES = \
src/udev/udevadm-test-builtin.c
udevadm_LDADD = \
src/udev/udevadm-test-builtin.c
udevadm_LDADD = \
- libudev-core.la
+ libudev-core.la \
+ libsystemd-capability.la
# Update hwdb on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
# Update hwdb on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
@@
-3502,7
+3544,8
@@
test_udev_SOURCES = \
src/test/test-udev.c
test_udev_LDADD = \
src/test/test-udev.c
test_udev_LDADD = \
- libudev-core.la \
+ libudev-core.la \
+ libsystemd-capability.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
$(SELINUX_LIBS)
$(BLKID_LIBS) \
$(KMOD_LIBS) \
$(SELINUX_LIBS)
@@
-4041,6
+4084,8
@@
libsystemd_journal_core_la_SOURCES = \
src/journal/journald-wall.h \
src/journal/journald-native.c \
src/journal/journald-native.h \
src/journal/journald-wall.h \
src/journal/journald-native.c \
src/journal/journald-native.h \
+ src/journal/journald-audit.c \
+ src/journal/journald-audit.h \
src/journal/journald-rate-limit.c \
src/journal/journald-rate-limit.h \
src/journal/journal-internal.h
src/journal/journald-rate-limit.c \
src/journal/journald-rate-limit.h \
src/journal/journal-internal.h
@@
-4192,7
+4237,8
@@
bin_PROGRAMS += \
dist_systemunit_DATA += \
units/systemd-journald.socket \
dist_systemunit_DATA += \
units/systemd-journald.socket \
- units/systemd-journald-dev-log.socket
+ units/systemd-journald-dev-log.socket \
+ units/systemd-journald-audit.socket
nodist_systemunit_DATA += \
units/systemd-journald.service \
nodist_systemunit_DATA += \
units/systemd-journald.service \
@@
-4211,7
+4257,8
@@
dist_catalog_DATA = \
SOCKETS_TARGET_WANTS += \
systemd-journald.socket \
SOCKETS_TARGET_WANTS += \
systemd-journald.socket \
- systemd-journald-dev-log.socket
+ systemd-journald-dev-log.socket \
+ systemd-journald-audit.socket
SYSINIT_TARGET_WANTS += \
systemd-journald.service \
SYSINIT_TARGET_WANTS += \
systemd-journald.service \
@@
-4402,6
+4449,9
@@
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
nodist_systemunit_DATA += \
units/systemd-vconsole-setup.service
+dist_udevrules_DATA += \
+ src/vconsole/90-vconsole.rules
+
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
endif
SYSINIT_TARGET_WANTS += \
systemd-vconsole-setup.service
endif
@@
-5169,11
+5219,9
@@
networkctl_LDADD = \
test_network_SOURCES = \
src/network/test-network.c
test_network_SOURCES = \
src/network/test-network.c
-test_network_CFLAGS = \
- $(AM_CFLAGS)
-
test_network_LDADD = \
test_network_LDADD = \
- libsystemd-networkd-core.la
+ libsystemd-networkd-core.la \
+ libsystemd-capability.la
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
test_network_tables_SOURCES = \
src/network/test-network-tables.c \
@@
-6248,3
+6296,6
@@
print-%:
git-contrib:
@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
git-contrib:
@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+ tools/gdb-sd_dump_hashmaps.py