X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=93583a686a47d908316dc44621c8aeef62134e8a;hp=c94c192ce314bca48f7b76193ba4ad2a4d9f233e;hb=478c82693c386e7a6e8e4b37cc99fb19b12e7186;hpb=de1c301ed165eb4d04a0c9d4babe97912b5233bb

diff --git a/Makefile.am b/Makefile.am
index c94c192ce..93583a686 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -620,6 +620,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/set.h \
 	src/shared/fdset.c \
 	src/shared/fdset.h \
+	src/shared/prioq.c \
+	src/shared/prioq.h \
 	src/shared/strv.c \
 	src/shared/strv.h \
 	src/shared/env-util.c \
@@ -791,7 +793,8 @@ libsystemd_acl_la_CFLAGS = \
 	$(ACL_CFLAGS)
 
 libsystemd_acl_la_LIBADD = \
-	$(ACL_LIBS)
+	$(ACL_LIBS) \
+	libsystemd-shared.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -1075,7 +1078,8 @@ noinst_tests += \
 	test-sched-prio \
 	test-calendarspec \
 	test-strip-tab-ansi \
-	test-cgroup-util
+	test-cgroup-util \
+	test-prioq
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1166,6 +1170,15 @@ test_util_CFLAGS = \
 test_util_LDADD = \
 	libsystemd-core.la
 
+test_prioq_SOURCES = \
+	src/test/test-prioq.c
+
+test_prioq_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_prioq_LDADD = \
+	libsystemd-core.la
+
 test_log_SOURCES = \
 	src/test/test-log.c
 
@@ -1600,7 +1613,7 @@ libsystemd_daemon_la_SOURCES = \
 	src/libsystemd-daemon/sd-daemon.c
 
 libsystemd_daemon_internal_la_SOURCES = \
-        $(libsystemd_daemon_la_SOURCES)
+	$(libsystemd_daemon_la_SOURCES)
 
 libsystemd_daemon_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1629,7 +1642,7 @@ lib_LTLIBRARIES += \
 	libsystemd-daemon.la
 
 noinst_LTLIBRARIES += \
-        libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la
 
 pkgconfiglib_DATA += \
 	src/libsystemd-daemon/libsystemd-daemon.pc
@@ -1651,15 +1664,24 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-message.c \
 	src/libsystemd-bus/bus-message.h \
 	src/libsystemd-bus/bus-signature.c \
+	src/libsystemd-bus/bus-signature.h \
 	src/libsystemd-bus/bus-type.c \
 	src/libsystemd-bus/bus-type.h
 
+libsystemd_bus_la_LIBADD =  \
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la
+
 noinst_LTLIBRARIES += \
-        libsystemd-bus.la
+	libsystemd-bus.la
 
 noinst_tests += \
 	test-bus-marshal \
-	test-bus-signature
+	test-bus-signature \
+	test-bus-chat
+
+noinst_PROGRAMS += \
+	busctl
 
 test_bus_marshal_SOURCES = \
 	src/libsystemd-bus/test-bus-marshal.c
@@ -1682,6 +1704,25 @@ test_bus_signature_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la
 
+test_bus_chat_SOURCES = \
+	src/libsystemd-bus/test-bus-chat.c
+
+test_bus_chat_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
+test_bus_chat_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la \
+	libsystemd-id128-internal.la
+
+busctl_SOURCES = \
+	src/libsystemd-bus/busctl.c
+
+busctl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la
+
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
 SUBDIRS += \
@@ -2463,6 +2504,11 @@ journalctl_LDADD = \
 	libsystemd-id128-internal.la \
 	libsystemd-logs.la
 
+if HAVE_ACL
+journalctl_LDADD += \
+	libsystemd-acl.la
+endif
+
 if HAVE_QRENCODE
 journalctl_SOURCES += \
 	src/journal/journal-qrcode.c \
@@ -3544,7 +3590,7 @@ _journal_la_SOURCES = \
 
 _journal_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS)
 
 _journal_la_LDFLAGS = \
@@ -3565,7 +3611,7 @@ id128_la_SOURCES = \
 
 id128_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS) \
 	-I$(top_builddir)/src/python-systemd
 
@@ -3586,7 +3632,7 @@ _daemon_la_SOURCES = \
 
 _daemon_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS) \
 	-I$(top_builddir)/src/python-systemd
 
@@ -3607,7 +3653,7 @@ _reader_la_SOURCES = \
 
 _reader_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS)
 
 _reader_la_LDFLAGS = \
@@ -3644,7 +3690,7 @@ sphinx-%:
 destdir-sphinx: all
 	dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
 		$(MAKE) DESTDIR="$$dir" install && \
-	        $(MAKE) DESTDIR="$$dir" sphinx-html && \
+		$(MAKE) DESTDIR="$$dir" sphinx-html && \
 		rm -rf "$$dir"
 
 endif
@@ -3939,7 +3985,7 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 clean-local: $(CLEAN_LOCAL_HOOKS)
 	rm -rf $(abs_srcdir)/install-tree
 	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
-              $(abs_srcdir)/hwdb/iab.txt
+	      $(abs_srcdir)/hwdb/iab.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -3970,7 +4016,7 @@ hwdb-update:
 	( cd $(top_srcdir)/hwdb && \
 	wget -N http://www.linux-usb.org/usb.ids \
 	        http://pci-ids.ucw.cz/v2.2/pci.ids \
-		http://standards.ieee.org/develop/regauth/oui/oui.txt \
+	        http://standards.ieee.org/develop/regauth/oui/oui.txt \
 	        http://standards.ieee.org/develop/regauth/iab/iab.txt && \
 	./ids-update.pl )