machine-id-setup: avoid cyclic dependency, built twice instead

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9367dd05db3ca1bb87221448a6800e23c76a7086..edf92e3fff9a3969872596326a3ec292820c48ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -554,12 +554,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/socket-util.h \
        src/shared/cgroup-util.c \
        src/shared/cgroup-util.h \
-       src/shared/dbus-common.c \
-       src/shared/dbus-common.h \
-       src/shared/dbus-loop.c \
-       src/shared/dbus-loop.h \
-       src/shared/logs-show.c \
-       src/shared/logs-show.h \
        src/shared/cgroup-show.c \
        src/shared/cgroup-show.h \
        src/shared/unit-name.c \
@@ -572,21 +566,36 @@ libsystemd_shared_la_SOURCES = \
        src/shared/spawn-ask-password-agent.h \
        src/shared/mount-setup.c \
        src/shared/mount-setup.h \
-       src/shared/machine-id-setup.c \
-       src/shared/machine-id-setup.h \
        src/shared/loopback-setup.h \
        src/shared/loopback-setup.c \
        src/shared/specifier.c \
        src/shared/specifier.h \
        src/shared/spawn-polkit-agent.c \
-       src/shared/spawn-polkit-agent.h \
+       src/shared/spawn-polkit-agent.h
+
+libsystemd_shared_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+#-------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-dbus.la
+
+libsystemd_dbus_la_SOURCES = \
+       src/shared/dbus-common.c \
+       src/shared/dbus-common.h \
+       src/shared/dbus-loop.c \
+       src/shared/dbus-loop.h \
        src/shared/polkit.c \
        src/shared/polkit.h
 
-libsystemd_shared_la_CFLAGS = \
+libsystemd_dbus_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
+libsystemd_dbus_la_LIBADD = \
+       $(DBUS_LIBS)
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-label.la
@@ -613,6 +622,21 @@ libsystemd_label_la_CFLAGS = \
 libsystemd_label_la_LIBADD = \
        $(SELINUX_LIBS)
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-logs.la
+
+libsystemd_logs_la_SOURCES = \
+       src/shared/logs-show.c \
+       src/shared/logs-show.h
+
+libsystemd_logs_la_CFLAGS = \
+       $(AM_CFLAGS)
+
+libsystemd_logs_la_LIBADD = \
+       libsystemd-journal.la \
+       libsystemd-id128.la
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-capability.la
@@ -735,6 +759,8 @@ libsystemd_core_la_SOURCES = \
        src/core/locale-setup.c \
        src/core/hostname-setup.c \
        src/core/hostname-setup.h \
+       src/shared/machine-id-setup.c \
+       src/shared/machine-id-setup.h \
        src/core/fdset.c \
        src/core/fdset.h \
        src/core/condition.c \
@@ -768,6 +794,7 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-label.la \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS) \
        $(LIBWRAP_LIBS) \
@@ -799,7 +826,8 @@ systemd_CFLAGS = \
 systemd_LDADD = \
        libsystemd-core.la \
        libsystemd-daemon.la \
-       libsystemd-id128.la
+       libsystemd-id128.la \
+       libsystemd-dbus.la
 
 dist_pkgsysconf_DATA += \
        src/core/system.conf \
@@ -850,7 +878,8 @@ test_engine_CFLAGS = \
 
 test_engine_LDADD = \
        libsystemd-core.la \
-       libsystemd-daemon.la
+       libsystemd-daemon.la \
+       libsystemd-dbus.la
 
 test_job_type_SOURCES = \
        src/test/test-job-type.c
@@ -934,6 +963,7 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -947,6 +977,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
@@ -995,7 +1026,9 @@ systemd_tmpfiles_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup/machine-id-setup-main.c
+       src/machine-id-setup/machine-id-setup-main.c \
+       src/shared/machine-id-setup.c \
+       src/shared/machine-id-setup.h
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
@@ -1019,6 +1052,7 @@ systemd_fsck_CFLAGS = \
 
 systemd_fsck_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS)
 
@@ -1077,6 +1111,7 @@ systemd_cgroups_agent_CFLAGS = \
 
 systemd_cgroups_agent_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1093,6 +1128,8 @@ systemctl_LDADD = \
        libsystemd-daemon.la \
        libsystemd-journal.la \
        libsystemd-id128.la \
+       libsystemd-dbus.la \
+       libsystemd-logs.la
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1977,17 +2014,8 @@ journalctl_SOURCES = \
 journalctl_LDADD = \
        libsystemd-shared.la \
        libsystemd-journal.la \
-       libsystemd-id128.la
-
-if HAVE_XZ
-journalctl_SOURCES += \
-       src/journal/compress.c
-journalctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(XZ_CFLAGS)
-journalctl_LDADD += \
-       $(XZ_LIBS)
-endif
+       libsystemd-id128.la \
+       libsystemd-logs.la
 
 test_journal_SOURCES = \
        src/journal/test-journal.c \
@@ -2373,6 +2401,7 @@ systemd_hostnamed_CFLAGS = \
 systemd_hostnamed_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 rootlibexec_PROGRAMS += \
@@ -2423,6 +2452,7 @@ systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 nodist_systemunit_DATA += \
@@ -2482,6 +2512,7 @@ systemd_timedated_CFLAGS = \
 systemd_timedated_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        $(DBUS_LIBS)
 
 rootlibexec_PROGRAMS += \
@@ -2550,6 +2581,7 @@ systemd_logind_LDADD = \
        libsystemd-shared.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS)
 
@@ -2581,6 +2613,7 @@ loginctl_CFLAGS = \
 
 loginctl_LDADD = \
        libsystemd-shared.la \
+       libsystemd-dbus.la \
        libudev.la \
        $(DBUS_LIBS)