X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=58e5ce6c547152814758b9aa5d9d78c9628224b1;hp=b95ddf2b4cb06896a8bae1c74f6c0898f8cbd42b;hb=81fd105a5f9762fa2f2e42bc949876e32b3a126f;hpb=51323288fc628a5cac50914df915545d685b793e

diff --git a/Makefile.am b/Makefile.am
index b95ddf2b4..58e5ce6c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,17 +35,17 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBUDEV_CURRENT=6
+LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=0
-LIBUDEV_AGE=5
+LIBUDEV_AGE=6
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
-LIBSYSTEMD_CURRENT=3
-LIBSYSTEMD_REVISION=1
-LIBSYSTEMD_AGE=3
+LIBSYSTEMD_CURRENT=4
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=4
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -451,7 +451,6 @@ dist_systemunit_DATA = \
 	units/network-online.target \
 	units/nss-lookup.target \
 	units/nss-user-lookup.target \
-	units/hibernate.target \
 	units/hybrid-sleep.target \
 	units/poweroff.target \
 	units/reboot.target \
@@ -509,7 +508,6 @@ nodist_systemunit_DATA = \
 	units/emergency.service \
 	units/rescue.service \
 	units/user@.service \
-	units/systemd-hibernate.service \
 	units/systemd-hybrid-sleep.service \
 	units/systemd-suspend.service \
 	units/systemd-halt.service \
@@ -547,7 +545,7 @@ EXTRA_DIST += \
 	units/console-shell.service.m4.in \
 	units/console-getty.service.m4.in \
 	units/container-getty@.service.m4.in \
-	units/rescue.service.m4.in \
+	units/rescue.service.in \
 	units/systemd-initctl.service.in \
 	units/systemd-shutdownd.service.in \
 	units/systemd-remount-fs.service.in \
@@ -566,7 +564,6 @@ EXTRA_DIST += \
 	units/systemd-fsck-root.service.in \
 	units/user@.service.in \
 	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 \
@@ -581,7 +578,6 @@ CLEANFILES += \
 	units/console-shell.service.m4 \
 	units/console-getty.service.m4 \
 	units/container-getty@.service.m4 \
-	units/rescue.service.m4 \
 	units/user@.service.m4
 
 if HAVE_SYSV_COMPAT
@@ -860,6 +856,12 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/copy.h \
 	src/shared/base-filesystem.c \
 	src/shared/base-filesystem.h \
+	src/shared/memfd.c \
+	src/shared/memfd.h \
+	src/shared/uid-range.c \
+	src/shared/uid-range.h \
+	src/shared/switch-root.h \
+	src/shared/switch-root.c \
 	src/shared/nss-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
@@ -1101,14 +1103,14 @@ libsystemd_core_la_SOURCES = \
 	src/core/namespace.h \
 	src/core/build.h \
 	src/core/sysfs-show.h \
-	src/core/switch-root.h \
-	src/core/switch-root.c \
 	src/core/killall.h \
 	src/core/killall.c \
 	src/core/audit-fd.c \
 	src/core/audit-fd.h \
 	src/core/show-status.c \
-	src/core/show-status.h
+	src/core/show-status.h \
+	src/core/failure-action.c \
+	src/core/failure-action.h
 
 if HAVE_KMOD
 libsystemd_core_la_SOURCES += \
@@ -1319,7 +1321,9 @@ tests += \
 	test-conf-files \
 	test-capability \
 	test-async \
-	test-ratelimit
+	test-ratelimit \
+	test-condition-util \
+	test-uid-range
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1458,6 +1462,14 @@ test_async_SOURCES = \
 test_async_LDADD = \
 	libsystemd-shared.la
 
+test_condition_util_SOURCES = \
+	src/test/test-condition-util.c
+
+test_condition_util_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-internal.la
+
+
 test_fdset_SOURCES = \
 	src/test/test-fdset.c
 
@@ -1476,6 +1488,12 @@ test_util_SOURCES = \
 test_util_LDADD = \
 	libsystemd-core.la
 
+test_uid_range_SOURCES = \
+	src/test/test-uid-range.c
+
+test_uid_range_LDADD = \
+	libsystemd-core.la
+
 test_socket_util_SOURCES = \
 	src/test/test-socket-util.c
 
@@ -1914,14 +1932,16 @@ nodist_systemunit_DATA += \
 	units/systemd-tmpfiles-setup.service \
 	units/systemd-tmpfiles-clean.service
 
+nodist_tmpfiles_DATA = \
+	tmpfiles.d/etc.conf
+
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
 	tmpfiles.d/systemd-nologin.conf \
 	tmpfiles.d/systemd-remote.conf \
 	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf \
-	tmpfiles.d/var.conf \
-	tmpfiles.d/etc.conf
+	tmpfiles.d/var.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -1944,10 +1964,14 @@ INSTALL_DIRS += \
 endif
 
 EXTRA_DIST += \
+	tmpfiles.d/etc.conf.m4 \
 	units/systemd-tmpfiles-setup-dev.service.in \
 	units/systemd-tmpfiles-setup.service.in \
 	units/systemd-tmpfiles-clean.service.in
 
+CLEANFILES += \
+	tmpfiles.d/etc.conf
+
 # ------------------------------------------------------------------------------
 if ENABLE_SYSUSERS
 systemd_sysusers_SOURCES = \
@@ -2113,8 +2137,43 @@ systemd_system_update_generator_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
-if ENABLE_EFI
 # ------------------------------------------------------------------------------
+if ENABLE_HIBERNATE
+systemgenerator_PROGRAMS += \
+        systemd-hibernate-resume-generator
+
+rootlibexec_PROGRAMS += \
+        systemd-hibernate-resume
+
+systemd_hibernate_resume_SOURCES = \
+        src/hibernate-resume/hibernate-resume.c
+
+systemd_hibernate_resume_LDADD = \
+        libsystemd-internal.la \
+        libsystemd-shared.la
+
+systemd_hibernate_resume_generator_SOURCES = \
+	src/resume-generator/resume-generator.c
+
+systemd_hibernate_resume_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la
+
+EXTRA_DIST += \
+        units/systemd-hibernate.service.in \
+        units/systemd-hibernate-resume@.service.in
+
+dist_systemunit_DATA += \
+        units/hibernate.target
+
+nodist_systemunit_DATA += \
+        units/systemd-hibernate.service \
+        units/systemd-hibernate-resume@.service
+
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_EFI
 systemgenerator_PROGRAMS +=  \
 	systemd-efi-boot-generator
 
@@ -2382,7 +2441,6 @@ libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-memfd.h \
 	src/systemd/sd-utf8.h \
 	src/systemd/sd-event.h \
 	src/systemd/sd-rtnl.h \
@@ -2432,7 +2490,6 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-bus/bus-slot.h \
 	src/libsystemd/sd-bus/bus-protocol.h \
 	src/libsystemd/sd-bus/kdbus.h \
-	src/libsystemd/sd-bus/sd-memfd.c \
 	src/libsystemd/sd-utf8/sd-utf8.c \
 	src/libsystemd/sd-event/sd-event.c \
 	src/libsystemd/sd-event/event-util.h \
@@ -2550,7 +2607,6 @@ pkginclude_HEADERS += \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-memfd.h \
 	src/systemd/sd-utf8.h \
 	src/systemd/sd-event.h \
 	src/systemd/sd-rtnl.h \
@@ -2571,7 +2627,6 @@ tests += \
 	test-bus-kernel \
 	test-bus-kernel-bloom \
 	test-bus-kernel-benchmark \
-	test-bus-memfd \
 	test-bus-zero-copy \
 	test-bus-introspect \
 	test-bus-objects \
@@ -2725,13 +2780,6 @@ test_bus_kernel_benchmark_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-test_bus_memfd_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-memfd.c
-
-test_bus_memfd_LDADD = \
-	libsystemd-internal.la \
-	libsystemd-shared.la
-
 test_bus_zero_copy_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-zero-copy.c
 
@@ -2917,6 +2965,7 @@ noinst_LTLIBRARIES += \
 	libsystemd-terminal.la
 
 noinst_PROGRAMS += \
+	systemd-evcat \
 	systemd-subterm
 
 unifontdatadir=$(datadir)/unifont
@@ -2931,9 +2980,18 @@ tests += \
 endif
 
 libsystemd_terminal_la_CFLAGS = \
-	$(AM_CFLAGS)
+	$(AM_CFLAGS) \
+	$(TERMINAL_CFLAGS)
 
 libsystemd_terminal_la_SOURCES = \
+	src/libsystemd-terminal/idev.h \
+	src/libsystemd-terminal/idev-internal.h \
+	src/libsystemd-terminal/idev.c \
+	src/libsystemd-terminal/idev-evdev.c \
+	src/libsystemd-terminal/idev-keyboard.c \
+	src/libsystemd-terminal/sysview.h \
+	src/libsystemd-terminal/sysview-internal.h \
+	src/libsystemd-terminal/sysview.c \
 	src/libsystemd-terminal/term-internal.h \
 	src/libsystemd-terminal/term-charset.c \
 	src/libsystemd-terminal/term-page.c \
@@ -2944,8 +3002,23 @@ libsystemd_terminal_la_SOURCES = \
 	src/libsystemd-terminal/unifont.c
 
 libsystemd_terminal_la_LIBADD = \
+	libudev-internal.la \
 	libsystemd-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	$(TERMINAL_LIBS)
+
+systemd_evcat_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(TERMINAL_CFLAGS)
+
+systemd_evcat_SOURCES = \
+	src/libsystemd-terminal/evcat.c
+
+systemd_evcat_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	$(TERMINAL_LIBS)
 
 systemd_subterm_SOURCES = \
 	src/libsystemd-terminal/subterm.c
@@ -3222,18 +3295,6 @@ libudev_core_la_LIBADD = \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
-libudev_core_la_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
-
-if ENABLE_FIRMWARE
-libudev_core_la_SOURCES += \
-	src/udev/udev-builtin-firmware.c
-
-dist_udevrules_DATA += \
-	rules/50-firmware.rules
-endif
-
 if HAVE_KMOD
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-kmod.c
@@ -5677,6 +5738,11 @@ src/%: src/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
+tmpfiles.d/%: tmpfiles.d/%.m4
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+
+
 units/%: units/%.m4
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@