X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e3b629f89e76b009c3e6a8b1262ce56d55c179ca;hp=634c67d13f971f41e5799e861d781d51431f1e12;hb=d025f1e4dca8fc1436aff76f9e6185fe3e728daa;hpb=85210bffd8363e491b4c31f2d09404f9869ad0c7

diff --git a/Makefile.am b/Makefile.am
index 634c67d13..e3b629f89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,9 @@ SUBDIRS = . po
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
-LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=6
-LIBUDEV_AGE=1
+LIBUDEV_CURRENT=3
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=2
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
@@ -117,7 +117,6 @@ udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
 	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
@@ -242,7 +241,7 @@ systemgenerator_PROGRAMS = \
 	systemd-system-update-generator
 
 dist_bashcompletion_DATA = \
-	bash-completion/systemd-bash-completion.sh
+	shell-completion/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
@@ -273,7 +272,7 @@ dist_systemunit_DATA = \
 	units/nss-user-lookup.target \
 	units/mail-transfer-agent.target \
 	units/hibernate.target \
-	units/http-daemon.target \
+	units/hybrid-sleep.target \
 	units/poweroff.target \
 	units/reboot.target \
 	units/rescue.target \
@@ -329,6 +328,7 @@ nodist_systemunit_DATA = \
 	units/rescue.service \
 	units/user@.service \
 	units/systemd-hibernate.service \
+	units/systemd-hybrid-sleep.service \
 	units/systemd-suspend.service \
 	units/systemd-halt.service \
 	units/systemd-poweroff.service \
@@ -379,6 +379,7 @@ EXTRA_DIST += \
 	units/systemd-udev-settle.service \
 	units/debug-shell.service.in \
 	units/systemd-hibernate.service.in \
+	units/systemd-hybrid-sleep.service.in \
 	units/systemd-suspend.service.in \
 	units/quotaon.service.in \
 	introspect.awk \
@@ -534,6 +535,7 @@ MANPAGES_ALIAS = \
 	man/systemd-shutdownd.socket.8 \
 	man/systemd-shutdownd.8 \
 	man/systemd-hibernate.service.8 \
+	man/systemd-hybrid-sleep.service.8 \
 	man/systemd-sleep.8 \
 	man/systemd-shutdown.8 \
 	man/systemd-poweroff.service.8 \
@@ -608,6 +610,7 @@ man/systemd-initctl.8: man/systemd-initctl.service.8
 man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
 man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
 man/systemd-hibernate.service.8: man/systemd-suspend.service.8
+man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
 man/systemd-sleep.8: man/systemd-suspend.service.8
 man/systemd-shutdown.8: man/systemd-halt.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8
@@ -795,10 +798,14 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/spawn-ask-password-agent.h \
 	src/shared/specifier.c \
 	src/shared/specifier.h \
+	src/shared/replace-var.c \
+	src/shared/replace-var.h \
 	src/shared/spawn-polkit-agent.c \
 	src/shared/spawn-polkit-agent.h \
 	src/shared/hwclock.c \
-	src/shared/hwclock.h
+	src/shared/hwclock.h \
+	src/shared/time-dst.c \
+	src/shared/time-dst.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1176,7 +1183,9 @@ noinst_PROGRAMS += \
 	test-unit-name \
 	test-log \
 	test-unit-file \
-	test-date
+	test-date \
+	test-sleep \
+	test-replace-var
 
 TESTS += \
 	test-job-type \
@@ -1184,7 +1193,9 @@ TESTS += \
 	test-strv \
 	test-unit-name \
 	test-unit-file \
-	test-date
+	test-date \
+	test-sleep \
+	test-replace-var
 
 test_engine_SOURCES = \
 	src/test/test-engine.c
@@ -1252,6 +1263,18 @@ test_date_SOURCES = \
 test_date_LDADD = \
 	libsystemd-core.la
 
+test_sleep_SOURCES = \
+	src/test/test-sleep.c
+
+test_sleep_LDADD = \
+	libsystemd-core.la
+
+test_replace_var_SOURCES = \
+	src/test/test-replace-var.c
+
+test_replace_var_LDADD = \
+	libsystemd-shared.la
+
 test_daemon_SOURCES = \
 	src/test/test-daemon.c
 
@@ -1688,7 +1711,9 @@ libudev_la_SOURCES =\
 	src/libudev/libudev-device.c \
 	src/libudev/libudev-enumerate.c \
 	src/libudev/libudev-monitor.c \
-	src/libudev/libudev-queue.c
+	src/libudev/libudev-queue.c \
+	src/libudev/libudev-hwdb-def.h \
+	src/libudev/libudev-hwdb.c
 
 libudev_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1783,8 +1808,11 @@ dist_udevrules_DATA += \
 
 dist_udevhwdb_DATA = \
 	hwdb/20-pci-vendor-product.hwdb \
+	hwdb/20-pci-classes.hwdb \
 	hwdb/20-usb-vendor-product.hwdb \
-	hwdb/20-acpi-vendor.hwdb
+	hwdb/20-usb-classes.hwdb \
+	hwdb/20-acpi-vendor.hwdb \
+	hwdb/20-OUI.hwdb
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
@@ -1833,7 +1861,6 @@ noinst_LTLIBRARIES += \
 
 libudev_core_la_SOURCES = \
 	src/udev/udev.h \
-	src/udev/udev-hwdb.h \
 	src/udev/udev-event.c \
 	src/udev/udev-watch.c \
 	src/udev/udev-node.c \
@@ -1846,6 +1873,7 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-builtin-hwdb.c \
 	src/udev/udev-builtin-input_id.c \
 	src/udev/udev-builtin-kmod.c \
+	src/udev/udev-builtin-net_id.c \
 	src/udev/udev-builtin-path_id.c \
 	src/udev/udev-builtin-usb_id.c \
 	src/libsystemd-daemon/sd-daemon.c
@@ -2404,42 +2432,12 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
 	src/journal/journald.c \
-	src/journal/journald.h \
-	src/journal/journald-kmsg.c \
-	src/journal/journald-kmsg.h \
-	src/journal/journald-syslog.c \
-	src/journal/journald-syslog.h \
-	src/journal/journald-stream.c \
-	src/journal/journald-stream.h \
-	src/journal/journald-console.c \
-	src/journal/journald-console.h \
-	src/journal/journald-native.c \
-	src/journal/journald-native.h \
-	src/journal/journald-rate-limit.c \
-	src/journal/journald-rate-limit.h \
-	src/journal/journal-internal.h
-
-nodist_systemd_journald_SOURCES = \
-	src/journal/journald-gperf.c
+	src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-	libsystemd-label.la \
-	libsystemd-shared.la \
-	libsystemd-audit.la \
-	libsystemd-daemon.la \
-	libsystemd-id128-internal.la \
 	libsystemd-journal-internal.la \
-	libudev.la
-
-if ENABLE_LOGIND
-systemd_journald_LDADD += \
-	libsystemd-login-internal.la
-endif
-
-if HAVE_ACL
-systemd_journald_LDADD += \
-	libsystemd-acl.la
-endif
+	libsystemd-shared.la \
+	libsystemd-id128-internal.la
 
 systemd_cat_SOURCES = \
 	src/journal/cat.c
@@ -2496,12 +2494,11 @@ test_journal_send_LDADD = \
 	libsystemd-id128-internal.la
 
 test_journal_syslog_SOURCES = \
-	src/journal/test-journal-syslog.c \
-	src/journal/journald-syslog.c
+	src/journal/test-journal-syslog.c
 
 test_journal_syslog_LDADD = \
-	libsystemd-shared.la \
 	libsystemd-journal-internal.la \
+	libsystemd-shared.la \
 	libsystemd-id128-internal.la
 
 test_journal_match_SOURCES = \
@@ -2575,12 +2572,44 @@ libsystemd_journal_la_LIBADD = \
 	libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
-	$(libsystemd_journal_la_SOURCES)
+	$(libsystemd_journal_la_SOURCES) \
+	src/journal/journald-kmsg.c \
+	src/journal/journald-kmsg.h \
+	src/journal/journald-syslog.c \
+	src/journal/journald-syslog.h \
+	src/journal/journald-stream.c \
+	src/journal/journald-stream.h \
+	src/journal/journald-server.c \
+	src/journal/journald-server.h \
+	src/journal/journald-console.c \
+	src/journal/journald-console.h \
+	src/journal/journald-native.c \
+	src/journal/journald-native.h \
+	src/journal/journald-rate-limit.c \
+	src/journal/journald-rate-limit.h \
+	src/journal/journal-internal.h
 
 libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
-libsystemd_journal_internal_la_LIBADD =
+libsystemd_journal_internal_la_LIBADD = \
+	libsystemd-label.la \
+	libsystemd-audit.la \
+	libsystemd-daemon.la \
+	libudev.la
+
+nodist_libsystemd_journal_internal_la_SOURCES = \
+	src/journal/journald-gperf.c
+
+if ENABLE_LOGIND
+libsystemd_journal_internal_la_LIBADD += \
+	libsystemd-login-internal.la
+endif
+
+if HAVE_ACL
+libsystemd_journal_internal_la_LIBADD += \
+	libsystemd-acl.la
+endif
 
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
@@ -3971,7 +4000,7 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
 clean-local:
 	rm -rf $(abs_srcdir)/install-tree
-	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids
+	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
@@ -3991,7 +4020,8 @@ endif
 hwdb-update:
 	( cd hwdb && \
 	wget -N http://www.linux-usb.org/usb.ids && \
-	wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \
+	wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \
+	wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \
 	./ids-update.pl )
 
 upload: all distcheck