X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=923f81bb20fd019d040018e80692f299794ac048;hp=d9cc5f0f96e9f53b8e558ea17b5cad06bc9476ba;hb=c8c9c69f390ea9cf8e700515757d18fc08d8c4fe;hpb=f5944e0fd6cebfa0c5ba523ddf09b9d876eaa4d4

diff --git a/Makefile.am b/Makefile.am
index d9cc5f0f9..923f81bb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
@@ -40,19 +40,19 @@ LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=2
 LIBSYSTEMD_LOGIN_AGE=4
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=7
+LIBSYSTEMD_DAEMON_REVISION=8
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=17
+LIBSYSTEMD_ID128_REVISION=19
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=2
 LIBSYSTEMD_JOURNAL_AGE=8
 
 # Dirs of external packages
@@ -193,8 +193,8 @@ SHUTDOWN_TARGET_WANTS =
 LOCAL_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
 SYSINIT_TARGET_WANTS =
-BASIC_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
+TIMERS_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
 USER_UNIT_ALIASES =
@@ -211,8 +211,8 @@ install-target-wants-hook:
 	what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
 	what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
 	what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
-	what="$(BASIC_TARGET_WANTS)" && wants=basic.target && $(add-wants)
 	what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
+	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
 
 define add-wants
 	[ -z "$$what" ] || ( \
@@ -356,6 +356,7 @@ dist_systemunit_DATA = \
 	units/remote-fs.target \
 	units/remote-fs-pre.target \
 	units/network.target \
+	units/network-online.target \
 	units/nss-lookup.target \
 	units/nss-user-lookup.target \
 	units/hibernate.target \
@@ -371,6 +372,8 @@ dist_systemunit_DATA = \
 	units/sigpwr.target \
 	units/sleep.target \
 	units/sockets.target \
+	units/timers.target \
+	units/paths.target \
 	units/suspend.target \
 	units/swap.target \
 	units/systemd-initctl.socket \
@@ -793,7 +796,8 @@ libsystemd_acl_la_CFLAGS = \
 	$(ACL_CFLAGS)
 
 libsystemd_acl_la_LIBADD = \
-	$(ACL_LIBS)
+	$(ACL_LIBS) \
+	libsystemd-shared.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -1660,6 +1664,8 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-error.h \
 	src/libsystemd-bus/bus-internal.c \
 	src/libsystemd-bus/bus-internal.h \
+	src/libsystemd-bus/bus-socket.c \
+	src/libsystemd-bus/bus-socket.h \
 	src/libsystemd-bus/bus-message.c \
 	src/libsystemd-bus/bus-message.h \
 	src/libsystemd-bus/bus-signature.c \
@@ -1668,7 +1674,8 @@ libsystemd_bus_la_SOURCES = \
 	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
@@ -1831,9 +1838,9 @@ dist_udevrules_DATA += \
 	rules/95-udev-late.rules
 
 dist_udevhwdb_DATA = \
-	hwdb/20-pci-vendor-product.hwdb \
+	hwdb/20-pci-vendor-model.hwdb \
 	hwdb/20-pci-classes.hwdb \
-	hwdb/20-usb-vendor-product.hwdb \
+	hwdb/20-usb-vendor-model.hwdb \
 	hwdb/20-usb-classes.hwdb \
 	hwdb/20-bluetooth-vendor-product.hwdb \
 	hwdb/20-acpi-vendor.hwdb \
@@ -2502,6 +2509,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 \
@@ -3673,8 +3685,7 @@ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
 BUILT_SOURCES += \
 	src/python-systemd/id128-constants.h
 
-PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION)
+SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
 sphinx-%:
 	$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
 	$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
@@ -3725,7 +3736,8 @@ SED_PROCESS = \
 		-e 's,@VERSION\@,$(VERSION),g' \
 		-e 's,@rootprefix\@,$(rootprefix),g' \
 		-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-		-e 's,@sushell\@,$(sushell),g' \
+		-e 's,@SUSHELL\@,$(SUSHELL),g' \
+		-e 's,@DEBUGTTY\@,$(DEBUGTTY),g' \
 		-e 's,@KILL\@,$(KILL),g' \
 		-e 's,@QUOTAON\@,$(QUOTAON),g' \
 		-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
@@ -3906,7 +3918,7 @@ SYSINIT_TARGET_WANTS += \
 	systemd-tmpfiles-setup.service \
 	systemd-sysctl.service \
 	systemd-ask-password-console.path
-BASIC_TARGET_WANTS += \
+TIMERS_TARGET_WANTS += \
 	systemd-tmpfiles-clean.timer
 
 if HAVE_SYSV_COMPAT
@@ -3928,9 +3940,12 @@ SYSTEM_UNIT_ALIASES += \
 USER_UNIT_ALIASES += \
 	$(systemunitdir)/shutdown.target shutdown.target \
 	$(systemunitdir)/sockets.target sockets.target \
+	$(systemunitdir)/timers.target timers.target \
+	$(systemunitdir)/paths.target paths.target \
 	$(systemunitdir)/bluetooth.target bluetooth.target \
 	$(systemunitdir)/printer.target printer.target \
-	$(systemunitdir)/sound.target sound.target
+	$(systemunitdir)/sound.target sound.target \
+	$(systemunitdir)/smartcard.target smartcard.target
 
 GENERAL_ALIASES += \
 	$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
@@ -3954,6 +3969,8 @@ INSTALL_DIRS += \
 	$(sysconfdir)/modules-load.d \
 	$(prefix)/lib/sysctl.d \
 	$(sysconfdir)/sysctl.d \
+	$(prefix)/lib/kernel/install.d \
+	$(sysconfdir)/kernel/install.d \
 	$(systemshutdowndir) \
 	$(systemsleepdir) \
 	$(systemgeneratordir) \