X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=21a0e4b09a429b184451cca9d5d85069d708694c;hp=e599da9b53e387827a9a6a297b8918a6ca8c5e49;hb=4b73a0c0612d26d49791f389e92f85d6444c36af;hpb=2181a7f558eb52a22f09f8add9ac0abb4f2ee016

diff --git a/Makefile.am b/Makefile.am
index e599da9b5..21a0e4b09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,28 +32,28 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=2
-LIBSYSTEMD_LOGIN_AGE=4
+LIBSYSTEMD_LOGIN_CURRENT=5
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=5
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=8
+LIBSYSTEMD_DAEMON_REVISION=9
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=19
+LIBSYSTEMD_ID128_REVISION=20
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=2
-LIBSYSTEMD_JOURNAL_AGE=8
+LIBSYSTEMD_JOURNAL_CURRENT=9
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=9
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -167,6 +167,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/libudev \
 	-I $(top_srcdir)/src/udev \
+	-I $(top_srcdir)/src/libsystemd-bus \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -221,7 +222,7 @@ define add-wants
 	  $(MKDIR_P) -m 0755 $$dir && \
 	  cd $$dir && \
 	  rm -f $$what && \
-	  for i in $$what; do ln -s ../$$i . || exit $$? ; done )
+	  for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
 endef
 
 install-directories-hook:
@@ -239,7 +240,7 @@ define install-aliases
 	$(MKDIR_P) /$(DESTDIR)$$dir && \
 	while [ -n "$$1" ]; do \
 		rm -f $(DESTDIR)$$dir/$$2 && \
-		ln -s $$1 $(DESTDIR)$$dir/$$2 && \
+		$(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
 		shift 2 || exit $$?; \
 	done
 endef
@@ -1086,7 +1087,9 @@ noinst_tests += \
 	test-calendarspec \
 	test-strip-tab-ansi \
 	test-cgroup-util \
-	test-prioq
+	test-prioq \
+	test-fileio \
+	test-time
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1186,6 +1189,24 @@ test_prioq_CFLAGS = \
 test_prioq_LDADD = \
 	libsystemd-core.la
 
+test_fileio_SOURCES = \
+	src/test/test-fileio.c
+
+test_fileio_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_fileio_LDADD = \
+	libsystemd-core.la
+
+test_time_SOURCES = \
+	src/test/test-time.c
+
+test_time_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_time_LDADD = \
+	libsystemd-core.la
+
 test_log_SOURCES = \
 	src/test/test-log.c
 
@@ -1611,7 +1632,9 @@ systemd_stdio_bridge_SOURCES = \
 	src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-bus.la \
+	libsystemd-daemon.la
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
@@ -1666,10 +1689,11 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 libsystemd_bus_la_SOURCES = \
+	src/systemd/sd-bus.h \
+	src/systemd/sd-bus-protocol.h \
 	src/libsystemd-bus/sd-bus.c \
-	src/libsystemd-bus/sd-bus.h \
-	src/libsystemd-bus/sd-bus-protocol.h \
 	src/libsystemd-bus/bus-control.c \
+	src/libsystemd-bus/bus-control.h \
 	src/libsystemd-bus/bus-error.c \
 	src/libsystemd-bus/bus-error.h \
 	src/libsystemd-bus/bus-internal.c \
@@ -1681,11 +1705,14 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-signature.c \
 	src/libsystemd-bus/bus-signature.h \
 	src/libsystemd-bus/bus-type.c \
-	src/libsystemd-bus/bus-type.h
+	src/libsystemd-bus/bus-type.h \
+	src/libsystemd-bus/bus-match.c \
+	src/libsystemd-bus/bus-match.h
 
 libsystemd_bus_la_LIBADD =  \
 	libsystemd-id128-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-daemon.la
 
 noinst_LTLIBRARIES += \
 	libsystemd-bus.la
@@ -1694,7 +1721,8 @@ noinst_tests += \
 	test-bus-marshal \
 	test-bus-signature \
 	test-bus-chat \
-	test-bus-server
+	test-bus-server \
+	test-bus-match
 
 noinst_PROGRAMS += \
 	busctl
@@ -1744,6 +1772,17 @@ test_bus_server_LDADD = \
 	libsystemd-bus.la \
 	libsystemd-id128-internal.la
 
+test_bus_match_SOURCES = \
+	src/libsystemd-bus/test-bus-match.c
+
+test_bus_match_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_bus_match_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la \
+	libsystemd-id128-internal.la
+
 busctl_SOURCES = \
 	src/libsystemd-bus/busctl.c
 
@@ -2450,7 +2489,8 @@ libsystemd_id128_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-daemon-internal.la
 
 libsystemd_id128_internal_la_SOURCES = \
 	$(libsystemd_id128_la_SOURCES)
@@ -2852,6 +2892,7 @@ systemd_journal_gatewayd_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-daemon.la \
+	libsystemd-bus.la \
 	$(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
@@ -3511,7 +3552,6 @@ pam_systemd_la_LDFLAGS = \
 	-export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
-	libsystemd-daemon.la \
 	libsystemd-audit.la \
 	libsystemd-dbus.la \
 	libsystemd-shared.la \