summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-05-31 22:12:47 +0200
committerKay Sievers <kay@vrfy.org>2012-05-31 22:12:47 +0200
commit477572f5c7ffc2febc75277ca84d15bd151d42ca (patch)
tree6e4f4f90a4a49acd1d415df29bf84958eb77dd2a
parente96cd586c5195b73af74791280d8461510258b48 (diff)
build-sys: split-off D-Bus requires from selinux convenience lib
-rw-r--r--Makefile.am20
1 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 8019317504..833f72ac5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -612,13 +612,23 @@ libsystemd_dbus_la_LIBADD = \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
- libsystemd-label.la
+ libsystemd-units.la
-libsystemd_label_la_SOURCES = \
+libsystemd_units_la_SOURCES = \
src/shared/install.c \
src/shared/install.h \
src/shared/path-lookup.c \
- src/shared/path-lookup.h \
+ src/shared/path-lookup.h
+
+libsystemd_units_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
src/shared/cgroup-label.c \
src/shared/socket-label.c \
src/shared/label.c \
@@ -632,7 +642,6 @@ libsystemd_label_la_SOURCES = \
libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS) \
$(SELINUX_CFLAGS)
libsystemd_label_la_LIBADD = \
@@ -816,6 +825,7 @@ libsystemd_core_la_CFLAGS = \
libsystemd_core_la_LIBADD = \
libsystemd-capability.la \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
@@ -986,6 +996,7 @@ test_install_CFLAGS = \
$(DBUS_CFLAGS)
test_install_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la
@@ -1197,6 +1208,7 @@ systemctl_CFLAGS = \
$(DBUS_CFLAGS)
systemctl_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \