diff options
| -rw-r--r-- | src/busctl/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-coredump/coredumpctl/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-machine/libmachine-core/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-machine/nss-mymachines/Makefile | 2 | ||||
| -rw-r--r-- | src/libshared/Makefile | 6 | ||||
| -rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 5 | ||||
| -rw-r--r-- | src/systemd-nspawn/Makefile | 6 |
7 files changed, 13 insertions, 12 deletions
diff --git a/src/busctl/Makefile b/src/busctl/Makefile index a1286f1705..d4a3c628cb 100644 --- a/src/busctl/Makefile +++ b/src/busctl/Makefile @@ -32,7 +32,7 @@ busctl_SOURCES = \ src/libsystemd/sd-bus/busctl-introspect.h busctl_LDADD = \ - $(topoutdir)/src/libshared/libshared.la + libshared.la systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += $(libbasic.CPPFLAGS) diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile index 1c3e9c9c30..07dbe437bf 100644 --- a/src/grp-coredump/coredumpctl/Makefile +++ b/src/grp-coredump/coredumpctl/Makefile @@ -27,7 +27,7 @@ coredumpctl_SOURCES = \ src/coredump/coredumpctl.c coredumpctl_LDADD = \ - $(topoutdir)/src/libshared/libshared.la + libshared.la bin_PROGRAMS += \ coredumpctl diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index 8c324808ca..de95c44f8e 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -33,7 +33,7 @@ libmachine_core_la_SOURCES = \ src/machine/image-dbus.h libmachine_core_la_LIBADD = \ - $(topoutdir)/src/libshared/libshared.la + libshared.la noinst_LTLIBRARIES += \ libmachine-core.la diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index e52c970be3..fa281407fb 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -38,7 +38,7 @@ libnss_mymachines_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/nss-mymachines.sym libnss_mymachines_la_LIBADD = \ - $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la + libsystemd-internal.la lib_LTLIBRARIES += \ libnss_mymachines.la diff --git a/src/libshared/Makefile b/src/libshared/Makefile index c7e171aaa0..f6d3c87e42 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -132,9 +132,9 @@ libshared_la_CFLAGS = \ $(SECCOMP_CFLAGS) libshared_la_LIBADD = \ - $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la \ - $(topoutdir)/src/libsystemd/libsystemd-journal-internal/libsystemd-journal-internal.la \ - $(topoutdir)/src/libudev/src/libudev.la \ + libsystemd-internal.la \ + libsystemd-journal-internal.la \ + libudev.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ $(SECCOMP_LIBS) diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile index d71aa9416d..5608b561f6 100644 --- a/src/libsystemd/libsystemd-internal/Makefile +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -112,7 +112,7 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-resolve/sd-resolve.c libsystemd_internal_la_LIBADD = \ - $(topoutdir)/src/libbasic/libbasic.la \ + libbasic.la \ -lresolv noinst_LTLIBRARIES += \ @@ -250,7 +250,8 @@ test_resolve_LDADD = \ at.subdirs += $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la)))) at.depdirs += $(topoutdir)/src/libbasic - +$(outdir)/libsystemd-internal.la: $(patsubst src/libsystemd/%,$(srcdir)/%,$(filter %.c,$(libsystemd_internal_la_SOURCES))) +libsystemd_internal_la_SOURCES = systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += $(libshared.CPPFLAGS) diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 0cb85bb82d..db287fb926 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -53,17 +53,17 @@ gperf_gperf_sources += \ src/nspawn/nspawn-gperf.gperf systemd_nspawn_CFLAGS = \ - $(systemd.CFLAGS) \ + $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ $(SECCOMP_CFLAGS) systemd_nspawn_LDADD = \ - $(topoutdir)/src/libshared/libshared.la \ + libshared.la \ $(BLKID_LIBS) ifneq ($(HAVE_LIBIPTC),) systemd_nspawn_LDADD += \ - $(topoutdir)/src/libfirewall/libfirewall.la + libfirewall.la endif # HAVE_LIBIPTC bin_PROGRAMS += systemd-nspawn |