X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=969f85adfee82f86c9a9297406cf8e47fbda2005;hp=d8e9b16be071d57321e977e850647fb4f8259ad3;hb=e3017af97310da024ffb378ed155bc1676922ce7;hpb=89ffcd2ad5bf87866314e96c4179ba622851cd6e

diff --git a/Makefile.am b/Makefile.am
index d8e9b16be..969f85adf 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 \
@@ -1075,7 +1077,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 +1169,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 +1612,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 +1641,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,14 +1663,16 @@ 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-id128-internal.la \
+	libsystemd-shared.la
 
 noinst_LTLIBRARIES += \
-        libsystemd-bus.la
+	libsystemd-bus.la
 
 noinst_tests += \
 	test-bus-marshal \
@@ -3570,7 +3584,7 @@ _journal_la_SOURCES = \
 
 _journal_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS)
 
 _journal_la_LDFLAGS = \
@@ -3591,7 +3605,7 @@ id128_la_SOURCES = \
 
 id128_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS) \
 	-I$(top_builddir)/src/python-systemd
 
@@ -3612,7 +3626,7 @@ _daemon_la_SOURCES = \
 
 _daemon_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS) \
 	-I$(top_builddir)/src/python-systemd
 
@@ -3633,7 +3647,7 @@ _reader_la_SOURCES = \
 
 _reader_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        -fvisibility=default \
+	-fvisibility=default \
 	$(PYTHON_CFLAGS)
 
 _reader_la_LDFLAGS = \
@@ -3670,7 +3684,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
@@ -3965,7 +3979,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) \
@@ -3996,7 +4010,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 )