X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7d5bd5a8035ed5b68aa34f6fc6a9796a26b9d5f7;hp=2ba8d557923fc62b5e6ecd8de4f17b6ba1c3d144;hb=a4cc3e5ccc0a3033d764a9eb3ae5ee90db560682;hpb=d5a89d7dc17a5ba5cf4fc71f82963c5c94a31c3d

diff --git a/Makefile.am b/Makefile.am
index 2ba8d5579..7d5bd5a80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,8 +118,9 @@ dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
-noinst_PROGRAMS =
-TESTS =
+noinst_tests=
+noinst_PROGRAMS = $(noinst_tests)
+TESTS = $(noinst_tests)
 udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
@@ -218,7 +219,8 @@ endif
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
 	systemd-fstab-generator \
-	systemd-system-update-generator
+	systemd-system-update-generator \
+	systemd-efi-boot-generator
 
 dist_bin_SCRIPTS = \
 	src/analyze/systemd-analyze
@@ -259,7 +261,6 @@ dist_systemunit_DATA = \
 	units/network.target \
 	units/nss-lookup.target \
 	units/nss-user-lookup.target \
-	units/mail-transfer-agent.target \
 	units/hibernate.target \
 	units/hybrid-sleep.target \
 	units/poweroff.target \
@@ -292,7 +293,6 @@ dist_systemunit_DATA = \
 	units/quotaon.service \
 	units/systemd-ask-password-wall.path \
 	units/systemd-ask-password-console.path \
-	units/syslog.target \
 	units/systemd-udevd-control.socket \
 	units/systemd-udevd-kernel.socket \
 	units/system-update.target
@@ -377,24 +377,22 @@ EXTRA_DIST += \
 	introspect.awk \
 	man/custom-html.xsl
 
-if HAVE_KMOD
 EXTRA_DIST += \
 	units/systemd-modules-load.service.in
-endif
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
 	units/rc-local.service \
 	units/halt-local.service
 
-EXTRA_DIST += \
-	units/rc-local.service.in \
-	units/halt-local.service.in
-
 systemgenerator_PROGRAMS += \
 	systemd-rc-local-generator
 endif
 
+EXTRA_DIST += \
+	units/rc-local.service.in \
+	units/halt-local.service.in
+
 dist_doc_DATA = \
 	README \
 	NEWS \
@@ -684,23 +682,12 @@ CLEANFILES += \
 	${XML_FILES:.xml=.html}
 
 if HAVE_PYTHON
-noinst_DATA += \
-	man/index.html
-
-CLEANFILES += \
-	man/index.html
-
-man/index.html: make-man-index.py $(XML_FILES)
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(PYTHON) $^ > $@
-
 MANPAGES += \
-	man/systemd.directives.5
-
-EXTRA_DIST += \
-	man/index.html
+	man/systemd.index.7 \
+	man/systemd.directives.7
 
 XML_DIRECTIVE_FILES = \
+	man/systemd.xml \
 	man/systemd.unit.xml \
 	man/systemd.service.xml \
 	man/systemd.socket.xml \
@@ -716,13 +703,19 @@ XML_DIRECTIVE_FILES = \
 	man/systemd.device.xml \
 	man/systemd.conf.xml \
 	man/systemd.journal-fields.xml \
-	man/systemd.time.xml
+	man/systemd.time.xml \
+	man/bootchart.conf.xml
+
+man/systemd.index.xml: make-man-index.py $(filter-out man/systemd.index.xml,$(XML_FILES))
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(PYTHON) $^ > $@
 
 man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(PYTHON) $^ > $@
 
 EXTRA_DIST += \
+	man/systemd.index.xml \
 	man/systemd.directives.xml
 
 endif
@@ -755,6 +748,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/util.h \
 	src/shared/virt.c \
 	src/shared/virt.h \
+	src/shared/efivars.c \
+	src/shared/efivars.h \
 	src/shared/path-util.c \
 	src/shared/path-util.h \
 	src/shared/time-util.c \
@@ -811,7 +806,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/time-dst.c \
 	src/shared/time-dst.h \
 	src/shared/calendarspec.c \
-	src/shared/calendarspec.h
+	src/shared/calendarspec.h \
+	src/shared/output-mode.h
 
 libsystemd_shared_la_LIBADD = libsystemd-daemon.la
 
@@ -1104,7 +1100,7 @@ BUILT_SOURCES += \
 
 src/core/syscall-list.txt: Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
 
 src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1116,7 +1112,7 @@ src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
 
 src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
@@ -1181,27 +1177,17 @@ CLEANFILES += \
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
 	test-engine \
-	test-job-type \
 	test-ns \
 	test-loopback \
 	test-hostname \
 	test-daemon \
 	test-cgroup \
-	test-env-replace \
-	test-strv \
 	test-install \
 	test-watchdog \
-	test-unit-name \
 	test-log \
-	test-unit-file \
-	test-date \
-	test-sleep \
-	test-replace-var \
-	test-sched-prio \
-	test-calendarspec \
-	test-strip-tab-ansi
+	test-efivars
 
-TESTS += \
+noinst_tests += \
 	test-job-type \
 	test-env-replace \
 	test-strv \
@@ -1212,7 +1198,8 @@ TESTS += \
 	test-replace-var \
 	test-sched-prio \
 	test-calendarspec \
-	test-strip-tab-ansi
+	test-strip-tab-ansi \
+	test-cgroup-util
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1263,6 +1250,12 @@ test_hostname_SOURCES = \
 test_hostname_LDADD = \
 	libsystemd-core.la
 
+test_efivars_SOURCES = \
+	src/test/test-efivars.c
+
+test_efivars_LDADD = \
+	libsystemd-shared.la
+
 test_unit_name_SOURCES = \
 	src/test/test-unit-name.c
 
@@ -1329,6 +1322,13 @@ test_cgroup_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+test_cgroup_util_SOURCES = \
+	src/test/test-cgroup-util.c
+
+test_cgroup_util_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la
+
 test_env_replace_SOURCES = \
 	src/test/test-env-replace.c
 
@@ -1546,6 +1546,14 @@ systemd_system_update_generator_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_efi_boot_generator_SOURCES = \
+	src/efi-boot-generator/efi-boot-generator.c
+
+systemd_efi_boot_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator/rc-local-generator.c
@@ -2446,10 +2454,7 @@ test_id128_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-id128-internal.la
 
-noinst_PROGRAMS += \
-	test-id128
-
-TESTS += \
+noinst_tests += \
 	test-id128
 
 pkginclude_HEADERS += \
@@ -2739,17 +2744,10 @@ UNINSTALL_DATA_HOOKS += \
 	catalog-remove-hook
 
 noinst_PROGRAMS += \
-	test-journal \
-	test-journal-send \
-	test-journal-syslog \
-	test-journal-match \
 	test-journal-enum \
-	test-journal-stream \
-	test-journal-verify \
-	test-mmap-cache \
 	test-catalog
 
-TESTS += \
+noinst_tests += \
 	test-journal \
 	test-journal-send \
 	test-journal-syslog \
@@ -2827,7 +2825,9 @@ rootlibexec_PROGRAMS += \
 	systemd-journal-gatewayd
 
 systemd_journal_gatewayd_SOURCES = \
-	src/journal/journal-gatewayd.c
+	src/journal/journal-gatewayd.c \
+	src/journal/microhttpd-util.h \
+	src/journal/microhttpd-util.c
 
 systemd_journal_gatewayd_LDADD = \
 	libsystemd-shared.la \
@@ -3692,6 +3692,7 @@ MANPAGES_ALIAS += \
 	man/sd_session_get_type.3 \
 	man/sd_session_get_class.3 \
 	man/sd_session_get_display.3 \
+	man/sd_session_get_tty.3 \
 	man/sd_pid_get_owner_uid.3 \
 	man/sd_pid_get_unit.3 \
 	man/sd_uid_is_on_seat.3 \
@@ -3716,6 +3717,7 @@ man/sd_session_get_state.3: man/sd_session_is_active.3
 man/sd_session_get_type.3: man/sd_session_is_active.3
 man/sd_session_get_class.3: man/sd_session_is_active.3
 man/sd_session_get_display.3: man/sd_session_is_active.3
+man/sd_session_get_tty.3: man/sd_session_is_active.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_pid_get_unit.3: man/sd_pid_get_session.3
 man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
@@ -3944,16 +3946,16 @@ docs/sysvinit/README: docs/sysvinit/README.in
 docs/var-log/README: docs/var-log/README.in
 	$(SED_PROCESS)
 
-EXTRA_DIST += \
-	docs/sysvinit/README.in \
-	docs/var-log/README.in
-
 CLEANFILES += \
 	docs/sysvinit/README \
 	docs/var-log/README
 
 endif
 
+EXTRA_DIST += \
+	docs/sysvinit/README.in \
+	docs/var-log/README.in
+
 EXTRA_DIST += \
 	shell-completion/systemd-zsh-completion.zsh
 
@@ -3983,10 +3985,7 @@ systemd-install-data-hook:
 		$(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
 		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-		$(DESTDIR)$(systemunitdir)/graphical.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system \
-		$(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants \
-		$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/user \
@@ -4107,11 +4106,14 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr
 
-
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
 	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
 	--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+else
+DISTCHECK_CONFIGURE_FLAGS += \
+	--with-sysvinit-path= \
+	--with-sysvrcnd-path=
 endif
 
 if ENABLE_GTK_DOC