diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:17:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-09 02:17:22 -0400 |
| commit | 23708daf3ba69ba9880102b4f720a3842883332e (patch) | |
| tree | d667fcd764ee137ea6a3275db664d88ee64c22a7 /src | |
| parent | edb237129437a0ccace5bfac0ffa0a109748f7b9 (diff) | |
stuff
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd/Makefile | 2 | ||||
| -rw-r--r-- | src/libudev/src/Makefile | 2 | ||||
| -rw-r--r-- | src/systemd-nspawn/Makefile | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 7728d0f911..51bcd0fc69 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -127,8 +127,6 @@ test_libsystemd_sym_LDADD = \ libsystemd.la $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym -$(outdir)/libsystemd.la: $(outdir)/libsystemd-internal/libsystemd-internal.la -$(outdir)/libsystemd.la: $(outdir)/libsystemd-journal-internal/libsystemd-journal-internal.la at.subdirs += libsystemd-internal libsystemd-journal-internal systemd.sed_files += libsystemd.pc #at.subdirs += compat-libs diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 9966b90aa1..41bb847bab 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -75,9 +75,9 @@ test_libudev_sym_LDADD = \ libudev.la systemd.sed_files += libudev.pc + systemd.CPPFLAGS += $(libbasic.CPPFLAGS) systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index db287fb926..380266ea7f 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -67,11 +67,8 @@ systemd_nspawn_LDADD += \ endif # HAVE_LIBIPTC bin_PROGRAMS += systemd-nspawn -at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall) -systemd.CPPFLAGS += $(libshared.CPPFLAGS) $(if $(HAVE_LIBIPTC),$(libfirewall.CPPFLAGS)) - -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += $(libsystemd.CPPFLAGS) +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 |