X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c81c40c5941115a1754d48e75be8299abb0ef506;hp=3ece887b134dfc9bf7c910fef662ee74709a7321;hb=e861b62154173b730c3fd8ca040641fba8870bb6;hpb=e7c431d3bcfdeeec5dcae0707145edb9a3f749aa

diff --git a/Makefile.am b/Makefile.am
index 3ece887b1..c81c40c59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=6
+LIBUDEV_REVISION=7
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
@@ -43,7 +43,7 @@ LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=8
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=8
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -51,11 +51,11 @@ LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=23
+LIBSYSTEMD_ID128_REVISION=24
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
 LIBSYSTEMD_JOURNAL_AGE=11
 
 # Dirs of external packages
@@ -315,7 +315,6 @@ rootlibexec_PROGRAMS = \
 	systemd-remount-fs \
 	systemd-reply-password \
 	systemd-fsck \
-	systemd-timestamp \
 	systemd-ac-power \
 	systemd-sysctl \
 	systemd-sleep
@@ -340,7 +339,8 @@ dist_bashcompletion_DATA = \
 	shell-completion/bash/journalctl \
 	shell-completion/bash/systemctl \
 	shell-completion/bash/systemd-analyze \
-	shell-completion/bash/udevadm
+	shell-completion/bash/udevadm \
+	shell-completion/bash/kernel-install
 
 dist_sysctl_DATA = \
 	sysctl.d/50-default.conf
@@ -752,6 +752,7 @@ libsystemd_label_la_SOURCES = \
 	src/shared/selinux-util.c \
 	src/shared/selinux-util.h \
 	src/shared/mkdir.c \
+	src/shared/mkdir-label.c \
 	src/shared/mkdir.h \
 	src/shared/ask-password-api.c \
 	src/shared/ask-password-api.h \
@@ -1606,13 +1607,6 @@ systemd_fsck_LDADD = \
 	libsystemd-dbus.la \
 	libudev.la
 
-# ------------------------------------------------------------------------------
-systemd_timestamp_SOURCES = \
-	src/timestamp/timestamp.c
-
-systemd_timestamp_LDADD = \
-	libsystemd-shared.la
-
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
 	src/ac-power/ac-power.c
@@ -1841,6 +1835,9 @@ libsystemd_daemon_la_LDFLAGS = \
 	-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
+libsystemd_daemon_la_LIBADD =  \
+	$(RT_LIBS)
+
 pkginclude_HEADERS += \
 	src/systemd/sd-daemon.h
 
@@ -3911,7 +3908,7 @@ _journal_la_SOURCES = \
 _journal_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=default \
-	$(PYTHON_CFLAGS)
+	$(PYTHON_DEVEL_CFLAGS)
 
 _journal_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -3920,7 +3917,7 @@ _journal_la_LDFLAGS = \
 	-avoid-version
 
 _journal_la_LIBADD = \
-	$(PYTHON_LIBS) \
+	$(PYTHON_DEVEL_LIBS) \
 	libsystemd-journal.la
 
 id128_la_SOURCES = \
@@ -3932,7 +3929,7 @@ id128_la_SOURCES = \
 id128_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=default \
-	$(PYTHON_CFLAGS) \
+	$(PYTHON_DEVEL_CFLAGS) \
 	-I$(top_builddir)/src/python-systemd
 
 id128_la_LDFLAGS = \
@@ -3942,7 +3939,7 @@ id128_la_LDFLAGS = \
 	-avoid-version
 
 id128_la_LIBADD = \
-	$(PYTHON_LIBS) \
+	$(PYTHON_DEVEL_LIBS) \
 	libsystemd-id128.la
 
 _daemon_la_SOURCES = \
@@ -3953,7 +3950,7 @@ _daemon_la_SOURCES = \
 _daemon_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=default \
-	$(PYTHON_CFLAGS) \
+	$(PYTHON_DEVEL_CFLAGS) \
 	-I$(top_builddir)/src/python-systemd
 
 _daemon_la_LDFLAGS = \
@@ -3963,7 +3960,7 @@ _daemon_la_LDFLAGS = \
 	-avoid-version
 
 _daemon_la_LIBADD = \
-	$(PYTHON_LIBS) \
+	$(PYTHON_DEVEL_LIBS) \
 	libsystemd-daemon.la
 
 _reader_la_SOURCES = \
@@ -3974,7 +3971,7 @@ _reader_la_SOURCES = \
 _reader_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=default \
-	$(PYTHON_CFLAGS)
+	$(PYTHON_DEVEL_CFLAGS)
 
 _reader_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -3983,7 +3980,7 @@ _reader_la_LDFLAGS = \
 	-avoid-version
 
 _reader_la_LIBADD = \
-	$(PYTHON_LIBS) \
+	$(PYTHON_DEVEL_LIBS) \
 	libsystemd-journal.la \
 	libsystemd-id128.la \
 	libsystemd-shared.la \
@@ -3997,7 +3994,7 @@ login_la_SOURCES = \
 login_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=default \
-	$(PYTHON_CFLAGS)
+	$(PYTHON_DEVEL_CFLAGS)
 
 login_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -4006,7 +4003,7 @@ login_la_LDFLAGS = \
 	-avoid-version
 
 login_la_LIBADD = \
-	$(PYTHON_LIBS) \
+	$(PYTHON_DEVEL_LIBS) \
 	libsystemd-journal.la \
 	libsystemd-login.la \
 	libsystemd-shared.la \