diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-12 17:53:19 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-12 17:53:19 +0200 |
| commit | 4fc5568804ef50d9cc857eee86012d388620edd3 (patch) | |
| tree | 5c116d3e240b0d099e0cc852bbe36ec418106d4b | |
| parent | 25d042e81516246b1ebf706a57c47ac19abb0b8a (diff) | |
machine-id-setup: avoid cyclic dependency, built twice instead
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 61891d47a5..edf92e3fff 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 \ |