chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
25d042e
)
machine-id-setup: avoid cyclic dependency, built twice instead
author
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Apr 2012 15:53:19 +0000
(17:53 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 12 Apr 2012 15:53:19 +0000
(17:53 +0200)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 61891d47a5cdb4452cf76efeb496ffe9d9f07477..edf92e3fff9a3969872596326a3ec292820c48ad 100644
(file)
--- 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/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/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/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 \
src/core/fdset.c \
src/core/fdset.h \
src/core/condition.c \
@@
-1026,7
+1026,9
@@
systemd_tmpfiles_LDADD = \
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
# ------------------------------------------------------------------------------
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 \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \