X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a10c306cebc776c652c722bd94cde2dcf161136b;hp=f1a972dc6a857e2c3ac24505b9128430cb0c9639;hb=493657337ad8569e0998a3afa7d6fb357757364a;hpb=4a0a74179fcfb85c456794fd91fa2ae5d4d3bc8f

diff --git a/Makefile.am b/Makefile.am
index f1a972dc6..a10c306ce 100644
--- 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/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/bus-errors.c \
 	src/shared/device-nodes.c \
 	src/shared/device-nodes.h \
 	src/shared/util.c \
@@ -1130,8 +1132,6 @@ libsystemd_core_la_SOURCES = \
 	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 \
@@ -1346,6 +1346,7 @@ tests += \
 	test-hashmap \
 	test-set \
 	test-list \
+	test-unaligned \
 	test-tables \
 	test-device-nodes \
 	test-xml \
@@ -1358,7 +1359,9 @@ tests += \
 	test-ratelimit \
 	test-condition-util \
 	test-uid-range \
-	test-bus-policy
+	test-bus-policy \
+	test-locale-util \
+	test-copy
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1502,13 +1505,26 @@ test_async_SOURCES = \
 test_async_LDADD = \
 	libsystemd-shared.la
 
+test_locale_util_SOURCES = \
+	src/test/test-locale-util.c
+
+test_locale_util_LDADD = \
+	libsystemd-shared.la
+
+test_copy_SOURCES = \
+	src/test/test-copy.c
+
+test_copy_LDADD = \
+	libsystemd-shared.la
+
 test_condition_util_SOURCES = \
 	src/test/test-condition-util.c
 
 test_condition_util_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-internal.la
-
+	libsystemd-internal.la \
+	libsystemd-capability.la \
+	libsystemd-label.la
 
 test_fdset_SOURCES = \
 	src/test/test-fdset.c
@@ -1526,6 +1542,7 @@ test_util_SOURCES = \
 	src/test/test-util.c
 
 test_util_LDADD = \
+	-lm \
 	libsystemd-core.la
 
 test_uid_range_SOURCES = \
@@ -1610,6 +1627,12 @@ test_xml_LDADD = \
 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
 
@@ -2935,6 +2958,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-pppoe.h \
 	src/libsystemd-network/sd-dhcp-client.c \
 	src/libsystemd-network/sd-dhcp-server.c \
 	src/libsystemd-network/dhcp-network.c \
@@ -2949,6 +2973,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/sd-pppoe.c \
 	src/libsystemd-network/network-internal.c \
 	src/libsystemd-network/network-internal.h \
 	src/libsystemd-network/sd-icmp6-nd.c \
@@ -3008,6 +3033,14 @@ test_ipv4ll_LDADD = \
 	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 \
@@ -3037,6 +3070,9 @@ tests += \
 	test-icmp6-rs \
 	test-dhcp6-client
 
+manual_tests += \
+	test-pppoe
+
 # ------------------------------------------------------------------------------
 if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
@@ -3450,7 +3486,8 @@ systemd_udevd_SOURCES = \
 	src/udev/udevd.c
 
 systemd_udevd_LDADD = \
-	libudev-core.la
+	libudev-core.la \
+	libsystemd-capability.la
 
 udevadm_SOURCES = \
 	src/udev/udevadm.c \
@@ -3464,7 +3501,8 @@ udevadm_SOURCES = \
 	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.
@@ -3498,7 +3536,8 @@ test_udev_SOURCES = \
 	src/test/test-udev.c
 
 test_udev_LDADD = \
-	libudev-core.la \
+	libudev-core.la  \
+	libsystemd-capability.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS) \
 	$(SELINUX_LIBS)
@@ -4037,6 +4076,8 @@ libsystemd_journal_core_la_SOURCES = \
 	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
@@ -4188,7 +4229,8 @@ bin_PROGRAMS += \
 
 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 \
@@ -4207,7 +4249,8 @@ dist_catalog_DATA = \
 
 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 \
@@ -4398,6 +4441,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-vconsole-setup.service
 
+dist_udevrules_DATA += \
+	src/vconsole/90-vconsole.rules
+
 SYSINIT_TARGET_WANTS += \
 	systemd-vconsole-setup.service
 endif
@@ -5165,11 +5211,9 @@ networkctl_LDADD = \
 test_network_SOURCES = \
 	src/network/test-network.c
 
-test_network_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_network_LDADD = \
-	libsystemd-networkd-core.la
+	libsystemd-networkd-core.la \
+	libsystemd-capability.la
 
 test_network_tables_SOURCES = \
 	src/network/test-network-tables.c \