From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Apr 2012 15:53:19 +0000 (+0200)
Subject: machine-id-setup: avoid cyclic dependency, built twice instead
X-Git-Tag: v183~349
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4fc5568804ef50d9cc857eee86012d388620edd3

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

diff --git a/Makefile.am b/Makefile.am
index 61891d47a..edf92e3ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \