X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=a52a8931f31c81670d795f3a602e3d4aed5f5911;hb=771f19c06a9dbe19e4c3e532d901734f4b3b3a2b;hp=6e965a0085e03576f0403e94d8d1b935ec21aa23;hpb=77d47be64f8b0497c44a4288f2531fc1056624ae;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 6e965a008..a52a8931f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -579,14 +579,18 @@ libsystemd_basic_la_SOURCES = \
 	src/shared/utf8.c \
 	src/shared/utf8.h \
 	src/shared/cgroup-util.c \
-	src/shared/cgroup-util.h
+	src/shared/cgroup-util.h \
+	src/shared/pager.c \
+	src/shared/pager.h \
+	src/shared/ioprio.h \
+	src/shared/list.h \
+	src/shared/macro.h
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
-	libsystemd-capability.la \
 	$(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -739,13 +743,8 @@ libsystemd_core_la_SOURCES = \
 	src/cgroup-attr.h \
 	src/watchdog.c \
 	src/watchdog.h \
-	src/sd-daemon.c \
-	src/sd-id128.c \
-	src/macro.h \
 	src/def.h \
-	src/ioprio.h \
 	src/missing.h \
-	src/list.h \
 	src/securebits.h \
 	src/linux/auto_dev-ioctl.h \
 	src/linux/fanotify.h \
@@ -758,7 +757,6 @@ libsystemd_core_la_SOURCES = \
 	src/shutdownd.h \
 	src/umount.h \
 	src/ask-password-api.h \
-	src/pager.h \
 	src/sysfs-show.h \
 	src/polkit.h \
 	src/dbus-loop.h \
@@ -782,6 +780,7 @@ libsystemd_core_la_CFLAGS = \
 
 libsystemd_core_la_LIBADD = \
 	libsystemd-basic.la \
+	libsystemd-capability.la \
 	libudev.la \
 	$(DBUS_LIBS) \
 	$(LIBWRAP_LIBS) \
@@ -799,7 +798,9 @@ systemd_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 systemd_LDADD = \
-	libsystemd-core.la
+	libsystemd-core.la \
+	libsystemd-daemon.la \
+	libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
 test_engine_SOURCES = \
@@ -810,7 +811,8 @@ test_engine_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_engine_LDADD = \
-	libsystemd-core.la
+	libsystemd-core.la \
+	libsystemd-daemon.la
 
 test_job_type_SOURCES = \
 	src/test-job-type.c
@@ -961,11 +963,11 @@ systemd_tmpfiles_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup.c \
-	src/machine-id-main.c \
-	src/sd-id128.c
+	src/machine-id-main.c
 
 systemd_machine_id_setup_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-id128.la
 
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
@@ -1054,7 +1056,6 @@ systemctl_SOURCES = \
 	src/path-lookup.c \
 	src/cgroup-show.c \
 	src/unit-name.c \
-	src/pager.c \
 	src/install.c \
 	src/spawn-agent.c \
 	src/logs-show.c
@@ -1097,8 +1098,7 @@ systemd_reply_password_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
 	src/cgls.c \
-	src/cgroup-show.c \
-	src/pager.c
+	src/cgroup-show.c
 
 systemd_cgls_LDADD = \
 	libsystemd-basic.la
@@ -1841,11 +1841,11 @@ libsystemd_id128_la_LIBADD = \
 	libsystemd-basic.la
 
 test_id128_SOURCES = \
-	src/test-id128.c \
-	src/sd-id128.c
+	src/test-id128.c
 
 test_id128_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-id128.la
 
 noinst_PROGRAMS += \
 	test-id128
@@ -1889,8 +1889,7 @@ systemd_journald_SOURCES = \
 	src/journal/journal-file.c \
 	src/journal/lookup3.c \
 	src/journal/journal-rate-limit.c \
-	src/journal/sparse-endian.h \
-	src/sd-id128.c
+	src/journal/sparse-endian.h
 
 nodist_systemd_journald_SOURCES = \
 	src/journal/journald-gperf.c
@@ -1901,7 +1900,8 @@ systemd_journald_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
-	libsystemd-login.la
+	libsystemd-login.la \
+	libsystemd-id128.la
 
 if HAVE_ACL
 systemd_journald_LDADD += \
@@ -1929,7 +1929,6 @@ systemd_cat_LDADD = \
 
 journalctl_SOURCES = \
 	src/journal/journalctl.c \
-	src/pager.c \
 	src/logs-show.c
 
 journalctl_LDADD = \
@@ -1952,11 +1951,11 @@ test_journal_SOURCES = \
 	src/journal/sd-journal.c \
 	src/journal/journal-file.c \
 	src/journal/lookup3.c \
-	src/journal/journal-send.c \
-	src/sd-id128.c
+	src/journal/journal-send.c
 
 test_journal_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-id128.la
 
 if HAVE_XZ
 test_journal_SOURCES += \
@@ -2535,8 +2534,7 @@ loginctl_SOURCES = \
 	src/login/loginctl.c \
 	src/login/sysfs-show.c \
 	src/dbus-common.c \
-	src/cgroup-show.c \
-	src/pager.c
+	src/cgroup-show.c
 
 loginctl_CFLAGS = \
 	$(AM_CFLAGS) \