diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-13 00:04:14 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-13 00:04:14 -0400 |
| commit | 9f245fa03d1c22694d2c49c0d40cab52f94e4c8d (patch) | |
| tree | 2c4705680373facbb38e57376ffcf59f7a95c5bd | |
| parent | 6724edf48bf8c7b88f2d1e62c3d91c846de76248 (diff) | |
more
| -rw-r--r-- | config.mk.in | 10 | ||||
| -rw-r--r-- | src/Makefile | 15 | ||||
| -rw-r--r-- | src/systemd-ac-power/Makefile | 2 | ||||
| -rw-r--r-- | src/systemd-cryptsetup/Makefile | 2 |
4 files changed, 20 insertions, 9 deletions
diff --git a/config.mk.in b/config.mk.in index b28fa1f2a8..51075b68a3 100644 --- a/config.mk.in +++ b/config.mk.in @@ -102,14 +102,14 @@ libexecdir=$(prefix)/lib/systemd # Libraries we depend on libbasic.CPPFLAGS = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic libbasic.DEPENDS = $(topoutdir)/src/libbasic/libbasic.la -libcore.CPPFLAGS = -I$(topsrcdir)/src/libcore +libcore.CPPFLAGS = -I$(topsrcdir)/src/libcore $(libshared.CPPFLAGS) libcore.DEPENDS = $(topoutdir)/src/libcore/libcore.la libfirewall.CPPFLAGS = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall libfirewall.DEPENDS = $(topoutdir)/src/libfirewall/libfirewall.la -libshared.CPPFLAGS = $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared -libshared.DEPENDS = $(libsystemd-internal.DEPENDS) $(topoutdir)/src/libshared/libshared.la -libsystemd-internal.CPPFLAGS = $(libbasic.CPPFLAGS) $(libsystemd.CPPFLAGS) -libsystemd-internal.DEPENDS = $(libbasic.DEPENDS) $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la +libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +libshared.DEPENDS = $(topoutdir)/src/libshared/libshared.la +libsystemd-internal.CPPFLAGS = $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) +libsystemd-internal.DEPENDS = $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la libsystemd-journal-internal.CPPFLAGS = $(libsystemd.CPPFLAGS) libsystemd-journal-internal.DEPENDS = $(topoutdir)/src/libsystemd/libsystemd-journal-internal/libsystemd-journal-internal.la libsystemd-network.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-network -I$(topsrcdir)/src/libudev/src $(libsystemd.CPPFLAGS) diff --git a/src/Makefile b/src/Makefile index b3de845981..6b89d51b66 100644 --- a/src/Makefile +++ b/src/Makefile @@ -47,8 +47,19 @@ at.subdirs += libsystemd-network at.subdirs += libudev at.subdirs += nss-myhostname at.subdirs += systemd-activate -#at.subdirs += systemd-ac-power -#at.subdirs += systemd-analyze +at.subdirs += systemd-ac-power +at.subdirs += systemd-analyze +at.subdirs += systemd-ask-password +at.subdirs += systemd-backlight +at.subdirs += systemd-binfmt +at.subdirs += systemd-cgls +at.subdirs += systemd-cgroups-agent +at.subdirs += systemd-cgtop +at.subdirs += systemd-cryptsetup +at.subdirs += systemd-dbus1-generator +at.subdirs += systemd-debug-generator +at.subdirs += systemd-delta +at.subdirs += systemd-detect-virt #at.subdirs += systemd-machine-id-setup #at.subdirs += systemd-modules-load diff --git a/src/systemd-ac-power/Makefile b/src/systemd-ac-power/Makefile index 9aab0fab15..c2d8f89c33 100644 --- a/src/systemd-ac-power/Makefile +++ b/src/systemd-ac-power/Makefile @@ -30,6 +30,4 @@ systemd_ac_power_SOURCES = \ systemd_ac_power_LDADD = \ libshared.la -libexec_PROGRAMS += systemd-ac-power - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index 7ab3605a31..2a64200397 100644 --- a/src/systemd-cryptsetup/Makefile +++ b/src/systemd-cryptsetup/Makefile @@ -56,4 +56,6 @@ SYSINIT_TARGET_WANTS += \ endif # HAVE_LIBCRYPTSETUP +systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device + include $(topsrcdir)/build-aux/Makefile.tail.mk |