diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/busctl/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-boot/bootctl/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-coredump/coredumpctl/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-coredump/systemd-coredump/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 1 | ||||
| -rw-r--r-- | src/libshared/Makefile | 8 | ||||
| -rw-r--r-- | src/libudev/src/Makefile | 9 |
8 files changed, 11 insertions, 19 deletions
diff --git a/src/busctl/Makefile b/src/busctl/Makefile index d4a3c628cb..b256de00d2 100644 --- a/src/busctl/Makefile +++ b/src/busctl/Makefile @@ -34,8 +34,7 @@ busctl_SOURCES = \ busctl_LDADD = \ libshared.la -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +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 221257b905..3b5d86e95c 100644 --- a/src/grp-boot/bootctl/Makefile +++ b/src/grp-boot/bootctl/Makefile @@ -53,7 +53,5 @@ endif # HAVE_BLKID endif # ENABLE_EFI bootctl_LDADD += libbasic.la # was hidden by libshared->libsystemd->libbasic -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile index 07dbe437bf..4b291feb44 100644 --- a/src/grp-coredump/coredumpctl/Makefile +++ b/src/grp-coredump/coredumpctl/Makefile @@ -38,8 +38,6 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_coredumpctl -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index 7e1070507c..df1f126e52 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -78,8 +78,6 @@ EXTRA_DIST += \ sysctl.d/50-coredump.conf.in \ units/systemd-coredump@.service.in -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal systemd.CPPFLAGS += -I$(topsrcdir)/src/journal systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index 110d6484c7..d22e01e25f 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -49,9 +49,6 @@ test_machine_tables_LDADD = \ tests += \ test-machine-tables -systemd.CPPFLAGS += $(libshared.CPPFLAGS) -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index 454ab3f90e..53aa0eedaf 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -44,7 +44,6 @@ lib_LTLIBRARIES += \ libnss_mymachines.la libnss_mymachines_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) 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 9846a197c4..5a2a22bce8 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -137,7 +137,7 @@ libshared_la_CFLAGS = \ libshared_la_LIBADD = \ libsystemd-internal.la \ libsystemd-journal-internal.la \ - libudev.la \ + libudev-internal.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) @@ -149,8 +149,6 @@ test_local_addresses_LDADD = \ libshared.la libshared_la_LIBADD += libbasic.la # was hidden by libsystemd->libbasic -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus @@ -162,9 +160,9 @@ systemd.CPPFLAGS += -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" systemd.CPPFLAGS += -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" systemd.CPPFLAGS += -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" -systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" +systemd.CPPFLAGS += -DSYSTEMD_FSCK_PATH=\"$(libexecdir)/systemd-fsck\" -systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" +systemd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(bindir)/systemd-tty-ask-password-agent\" systemd.CPPFLAGS += -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" systemd.CPPFLAGS += -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 41bb847bab..69d6573b5f 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -74,10 +74,15 @@ test_libudev_sym_CFLAGS = \ test_libudev_sym_LDADD = \ libudev.la +noinst_LTLIBRARIES += \ + libudev-internal.la + +libudev_internal_la_SOURCES =\ + $(libudev_la_SOURCES) + systemd.sed_files += libudev.pc -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +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 |