diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-06-03 14:46:11 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-06-03 14:46:11 +0200 |
| commit | 4142554fcdd3dba1acb01f2866b526c1dd605def (patch) | |
| tree | ee02b5dc0dcc3183352ba1b15fdb2247459764c4 | |
| parent | 42fcc4d258cbcd53a7a3d38b9c12bc7b9b0f27dd (diff) | |
build-sys: split off libsystemd-machine convenience lib
Break the link order cycle by splitting off the machine parts which
use sd-bus but live in shared/.
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 64038a55c7..2e2abaead6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -942,10 +942,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/btrfs-ctree.h \ src/shared/rm-rf.c \ src/shared/rm-rf.h \ - src/shared/machine-image.c \ - src/shared/machine-image.h \ - src/shared/machine-pool.c \ - src/shared/machine-pool.h \ src/shared/copy.c \ src/shared/copy.h \ src/shared/install.c \ @@ -985,6 +981,16 @@ libsystemd_shared_la_LIBADD = \ -lm # ----------------------------------------------------------------------------- +noinst_LTLIBRARIES += \ + libsystemd-machine.la + +libsystemd_machine_la_SOURCES = \ + src/shared/machine-image.c \ + src/shared/machine-image.h \ + src/shared/machine-pool.c \ + src/shared/machine-pool.h + +# ----------------------------------------------------------------------------- if HAVE_LIBIPTC noinst_LTLIBRARIES += \ libsystemd-fw.la @@ -2678,8 +2684,8 @@ systemd_dbus1_generator_SOURCES = \ src/dbus1-generator/dbus1-generator.c systemd_dbus1_generator_LDADD = \ - libsystemd-shared.la \ - libsystemd-internal.la + libsystemd-internal.la \ + libsystemd-shared.la dbus1-generator-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) @@ -2806,6 +2812,7 @@ systemd_nspawn_CFLAGS = \ systemd_nspawn_LDADD = \ libudev-internal.la \ libsystemd-internal.la \ + libsystemd-machine.la \ libsystemd-shared.la \ $(BLKID_LIBS) @@ -5121,6 +5128,7 @@ libsystemd_machine_core_la_SOURCES = \ libsystemd_machine_core_la_LIBADD = \ libudev-internal.la \ libsystemd-internal.la \ + libsystemd-machine.la \ libsystemd-shared.la noinst_LTLIBRARIES += \ @@ -5231,6 +5239,7 @@ systemd_importd_CFLAGS = \ -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" systemd_importd_LDADD = \ + libsystemd-machine.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -5267,6 +5276,7 @@ systemd_pull_CFLAGS = \ -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" systemd_pull_LDADD = \ + libsystemd-machine.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(LIBCURL_LIBS) \ @@ -5294,6 +5304,7 @@ systemd_import_CFLAGS = \ $(ZLIB_CFLAGS) systemd_import_LDADD = \ + libsystemd-machine.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(XZ_LIBS) \ @@ -5317,6 +5328,7 @@ systemd_export_CFLAGS = \ $(ZLIB_CFLAGS) systemd_export_LDADD = \ + libsystemd-machine.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(XZ_LIBS) \ |