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

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 813ced272e511d38c79f9f1b211bbd8c5e35342c..edf92e3fff9a3969872596326a3ec292820c48ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -554,8 +554,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/socket-util.h \
        src/shared/cgroup-util.c \
        src/shared/cgroup-util.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 \
@@ -568,8 +566,6 @@ 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 \
@@ -626,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
@@ -748,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 \
@@ -1013,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 \
@@ -1114,6 +1129,7 @@ systemctl_LDADD = \
        libsystemd-journal.la \
        libsystemd-id128.la \
        libsystemd-dbus.la \
+       libsystemd-logs.la
        $(DBUS_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1998,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 \