chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e96cd58
)
build-sys: split-off D-Bus requires from selinux convenience lib
author
Kay Sievers
<kay@vrfy.org>
Thu, 31 May 2012 20:12:47 +0000
(22:12 +0200)
committer
Kay Sievers
<kay@vrfy.org>
Thu, 31 May 2012 20:12:47 +0000
(22:12 +0200)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 8019317504b87f86a11089a7f5ecda39cbc6a6a9..833f72ac5de8c1a445f9e17ba40021e763311802 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-612,13
+612,23
@@
libsystemd_dbus_la_LIBADD = \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
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/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 \
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) \
libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS) \
$(SELINUX_CFLAGS)
libsystemd_label_la_LIBADD = \
$(SELINUX_CFLAGS)
libsystemd_label_la_LIBADD = \
@@
-816,6
+825,7
@@
libsystemd_core_la_CFLAGS = \
libsystemd_core_la_LIBADD = \
libsystemd-capability.la \
libsystemd_core_la_LIBADD = \
libsystemd-capability.la \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
@@
-986,6
+996,7
@@
test_install_CFLAGS = \
$(DBUS_CFLAGS)
test_install_LDADD = \
$(DBUS_CFLAGS)
test_install_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-shared.la
@@
-1197,6
+1208,7
@@
systemctl_CFLAGS = \
$(DBUS_CFLAGS)
systemctl_LDADD = \
$(DBUS_CFLAGS)
systemctl_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \