chiark / gitweb /
machine-id-setup: avoid cyclic dependency, built twice instead
authorLennart Poettering <lennart@poettering.net>
Thu, 12 Apr 2012 15:53:19 +0000 (17:53 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 12 Apr 2012 15:53:19 +0000 (17:53 +0200)
Makefile.am

index 61891d4..edf92e3 100644 (file)
@@ -566,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 \
@@ -761,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 \
@@ -1026,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 \