diff options
| -rw-r--r-- | config.mk.in | 4 | ||||
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/busctl/Makefile | 1 | ||||
| -rw-r--r-- | src/grp-boot/bootctl/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-coredump/systemd-coredump/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 1 | ||||
| -rw-r--r-- | src/libshared/Makefile | 1 | ||||
| -rw-r--r-- | src/libudev/src/Makefile | 1 | ||||
| -rw-r--r-- | src/systemd-nspawn/Makefile | 2 |
9 files changed, 9 insertions, 11 deletions
diff --git a/config.mk.in b/config.mk.in index 2c187d0e93..605d40b7cd 100644 --- a/config.mk.in +++ b/config.mk.in @@ -108,8 +108,8 @@ libbasic.DEPENDS = $(topoutdir)/src/libbasic/libbasic.la #libcore.DEPENDS = libfirewall.CPPFLAGS = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall libfirewall.DEPENDS = $(topoutdir)/src/libfirewall/libfirewall.la -libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared -libshared.DEPENDS = $(topoutdir)/src/libshared/libshared.la +libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared $(libbasic.CPPFLAGS) +libshared.DEPENDS = $(topoutdir)/src/libshared/libshared.la $(libbasic.DEPENDS) libsystemd-internal.CPPFLAGS = $(libsystemd.CPPFLAGS) libsystemd-internal.DEPENDS = $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la libsystemd-journal-internal.CPPFLAGS = $(libsystemd.CPPFLAGS) diff --git a/src/Makefile b/src/Makefile index 7745eaa87c..e8448ad975 100644 --- a/src/Makefile +++ b/src/Makefile @@ -25,6 +25,12 @@ include $(topsrcdir)/build-aux/Makefile.head.mk at.subdirs += busctl at.subdirs += grp-boot +at.subdirs += grp-coredump +#at.subdirs += grp-journal +#at.subdirs += grp-journal-remote +#at.subdirs += grp-machine +#at.subdirs += grp-resolve + at.subdirs += libbasic at.subdirs += libfirewall at.subdirs += libshared diff --git a/src/busctl/Makefile b/src/busctl/Makefile index b256de00d2..4ea6019bc1 100644 --- a/src/busctl/Makefile +++ b/src/busctl/Makefile @@ -34,7 +34,6 @@ busctl_SOURCES = \ busctl_LDADD = \ libshared.la -busctl_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile index 3b5d86e95c..a983e32a9f 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -52,6 +52,4 @@ dist_zshcompletion_data += \ endif # HAVE_BLKID endif # ENABLE_EFI -bootctl_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index df1f126e52..5536bcf268 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -79,7 +79,7 @@ EXTRA_DIST += \ units/systemd-coredump@.service.in systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal -systemd.CPPFLAGS += -I$(topsrcdir)/src/journal +systemd.CPPFLAGS += -I$(topsrcdir)/src/grp-journal/libjournal-core systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index 53aa0eedaf..00a62bbafc 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -43,7 +43,6 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la -libnss_mymachines_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 5a2a22bce8..052865e882 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -148,7 +148,6 @@ test_local_addresses_SOURCES = \ test_local_addresses_LDADD = \ libshared.la -libshared_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 99f5c64fda..6628ec6253 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -80,7 +80,6 @@ test_libudev_sym_CFLAGS = \ test_libudev_sym_LDADD = \ libudev.la -libudev_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb systemd.sed_files += libudev.pc diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 9702abcbc5..48ebd739ed 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -82,8 +82,6 @@ manual_tests += \ test-patch-uid bin_PROGRAMS += systemd-nspawn -systemd_nspawn_LDADD += libsystemd.la # was hidden by libshared->libsystemd -systemd_nspawn_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src |