X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=290ec1eb603b1359e1aaf21e97ad415708744aa6;hb=bfdf1adc6e4e359c625bffd54d221b9dabaa75a6;hp=b2573199dc9c27cc9a7af08d80774d093a77c599;hpb=19fbd6253640bd66e59a688b796a100897d7c4d6;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index b2573199d..290ec1eb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,16 +32,16 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=5
+LIBUDEV_REVISION=6
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=7
-LIBSYSTEMD_LOGIN_REVISION=1
-LIBSYSTEMD_LOGIN_AGE=7
+LIBSYSTEMD_LOGIN_CURRENT=8
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=8
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=10
@@ -51,9 +51,9 @@ LIBSYSTEMD_ID128_CURRENT=0
 LIBSYSTEMD_ID128_REVISION=23
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=10
-LIBSYSTEMD_JOURNAL_REVISION=2
-LIBSYSTEMD_JOURNAL_AGE=10
+LIBSYSTEMD_JOURNAL_CURRENT=11
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=11
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -1115,7 +1115,8 @@ tests += \
 	test-fileio \
 	test-time \
 	test-hashmap \
-	test-list
+	test-list \
+	test-tables
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1228,6 +1229,18 @@ test_list_CFLAGS = \
 test_list_LDADD = \
 	libsystemd-core.la
 
+test_tables_SOURCES = \
+	src/test/test-tables.c \
+	src/shared/test-tables.h
+
+test_tables_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_tables_LDADD = \
+	libsystemd-core.la \
+	libsystemd-logs.la
+
 test_prioq_SOURCES = \
 	src/test/test-prioq.c
 
@@ -3583,17 +3596,29 @@ endif
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
-	src/machine/machined.h \
+	src/machine/machined.h
+
+systemd_machined_CFLAGS = \
+	$(libsystemd_machine_core_la_CFLAGS)
+
+systemd_machined_LDADD = \
+	libsystemd-machine-core.la \
+	$(libsystemd_machine_core_la_LIBADD)
+
+rootlibexec_PROGRAMS += \
+	systemd-machined
+
+libsystemd_machine_core_la_SOURCES = \
 	src/machine/machined-dbus.c \
 	src/machine/machine.c \
 	src/machine/machine.h \
 	src/machine/machine-dbus.c
 
-systemd_machined_CFLAGS = \
+libsystemd_machine_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
-systemd_machined_LDADD = \
+libsystemd_machine_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-audit.la \
 	libsystemd-shared.la \
@@ -3602,8 +3627,8 @@ systemd_machined_LDADD = \
 	libsystemd-id128-internal.la \
 	libudev.la
 
-rootlibexec_PROGRAMS += \
-	systemd-machined
+noinst_LTLIBRARIES += \
+	libsystemd-machine-core.la
 
 machinectl_SOURCES = \
 	src/machine/machinectl.c
@@ -3620,6 +3645,19 @@ machinectl_LDADD = \
 rootbin_PROGRAMS += \
 	machinectl
 
+test_machine_tables_SOURCES = \
+	src/machine/test-machine-tables.c
+
+test_machine_tables_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_machine_tables_LDADD = \
+	libsystemd-machine-core.la
+
+tests += \
+	test-machine-tables
+
 nodist_systemunit_DATA += \
 	units/systemd-machined.service
 
@@ -3644,7 +3682,27 @@ endif
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
 	src/login/logind.c \
-	src/login/logind.h \
+	src/login/logind.h
+
+nodist_systemd_logind_SOURCES = \
+	src/login/logind-gperf.c
+
+systemd_logind_CFLAGS = \
+	$(libsystemd_logind_core_la_CFLAGS)
+
+systemd_logind_LDADD = \
+	libsystemd-logind-core.la \
+	$(libsystemd_logind_core_la_LIBADD)
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+	src/login/logind-acl.c
+
+systemd_logind_LDADD += \
+	libsystemd-acl.la
+endif
+
+libsystemd_logind_core_la_SOURCES = \
 	src/login/logind-dbus.c \
 	src/login/logind-device.c \
 	src/login/logind-device.h \
@@ -3665,14 +3723,11 @@ systemd_logind_SOURCES = \
 	src/login/logind-user-dbus.c \
 	src/login/logind-acl.h
 
-nodist_systemd_logind_SOURCES = \
-	src/login/logind-gperf.c
-
-systemd_logind_CFLAGS = \
+libsystemd_logind_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+        $(DBUS_CFLAGS)
 
-systemd_logind_LDADD = \
+libsystemd_logind_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-audit.la \
 	libsystemd-shared.la \
@@ -3681,13 +3736,8 @@ systemd_logind_LDADD = \
 	libsystemd-id128-internal.la \
 	libudev.la
 
-if HAVE_ACL
-systemd_logind_SOURCES += \
-	src/login/logind-acl.c
-
-systemd_logind_LDADD += \
-	libsystemd-acl.la
-endif
+noinst_LTLIBRARIES += \
+	libsystemd-logind-core.la
 
 systemd_user_sessions_SOURCES = \
 	src/login/user-sessions.c
@@ -3750,10 +3800,23 @@ test_inhibit_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
+test_login_tables_SOURCES = \
+	src/login/test-login-tables.c
+
+test_login_tables_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_login_tables_LDADD = \
+	libsystemd-logind-core.la
+
 manual_tests += \
 	test-login \
 	test-inhibit
 
+tests += \
+	test-login-tables
+
 libsystemd_login_la_SOURCES = \
 	src/login/sd-login.c