X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=823bf03dd0a654d3804dc726c87a6e4cbc67dd3f;hb=5b4882b6aa4f61e5b2b207d8f417c60a6427e1c8;hp=0a3ed18a4e82d491cdb49e17c6e0b1313cf52d38;hpb=183de6d7d9def43ec90b94e775fdc49539a950ba;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 0a3ed18a4..823bf03dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,8 @@ pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
 rpmmacrosdir=$(sysconfdir)/rpm
+sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
+varlogdir=$(localstatedir)/log
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -480,6 +482,7 @@ MANPAGES = \
 	man/journald.conf.5 \
 	man/systemd-journald.service.8 \
 	man/journalctl.1 \
+	man/systemd-coredumpctl.1 \
 	man/systemd-inhibit.1 \
 	man/systemd-remount-fs.service.8 \
 	man/systemd-update-utmp-runlevel.service.8 \
@@ -511,7 +514,8 @@ MANPAGES = \
 	man/sd_journal_get_fd.3 \
 	man/sd_journal_get_usage.3 \
 	man/sd_journal_add_match.3 \
-	man/sd_journal_seek_head.3
+	man/sd_journal_seek_head.3 \
+	man/sd_journal_query_unique.3
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -582,7 +586,10 @@ MANPAGES_ALIAS = \
 	man/sd_journal_seek_monotonic_usec.3 \
 	man/sd_journal_seek_realtime_usec.3 \
 	man/sd_journal_seek_cursor.3 \
-	man/sd_journal_test_cursor.3
+	man/sd_journal_test_cursor.3 \
+	man/sd_journal_enumerate_unique.3 \
+	man/sd_journal_restart_unique.3 \
+	man/SD_JOURNAL_FOREACH_UNIQUE.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -653,6 +660,9 @@ man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
 man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
 man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
 man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
+man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3
+man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3
+man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -748,6 +758,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/set.h \
 	src/shared/strv.c \
 	src/shared/strv.h \
+	src/shared/strbuf.c \
+	src/shared/strbuf.h \
 	src/shared/conf-parser.c \
 	src/shared/conf-parser.h \
 	src/shared/log.c \
@@ -2448,6 +2460,13 @@ journalctl_LDADD += \
 	$(QRENCODE_LIBS)
 endif
 
+systemd_coredumpctl_SOURCES = \
+	src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal.la
+
 test_journal_SOURCES = \
 	src/journal/test-journal.c
 
@@ -2638,6 +2657,7 @@ rootbin_PROGRAMS += \
 	journalctl
 
 bin_PROGRAMS += \
+	systemd-coredumpctl \
 	systemd-cat
 
 dist_systemunit_DATA += \
@@ -3060,6 +3080,25 @@ MANPAGES_ALIAS += \
 	man/systemd-hostnamed.8
 
 man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
+hostnamectl_SOURCES = \
+	src/hostname/hostnamectl.c
+
+hostnamectl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+hostnamectl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-dbus.la \
+	libsystemd-id128-internal.la
+
+bin_PROGRAMS += \
+	hostnamectl
+
+MANPAGES += \
+	man/hostnamectl.1
+
 endif
 
 polkitpolicy_in_files += \
@@ -3131,6 +3170,24 @@ dist_noinst_SCRIPT = \
 update-kbd-model-map:
 	src/locale/generate-kbd-model-map > src/locale/kbd-model-map
 
+localectl_SOURCES = \
+	src/locale/localectl.c
+
+localectl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+localectl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-dbus.la \
+	libsystemd-id128-internal.la
+
+bin_PROGRAMS += \
+	localectl
+
+MANPAGES += \
+	man/localectl.1
+
 endif
 
 polkitpolicy_in_files += \
@@ -3194,6 +3251,24 @@ MANPAGES_ALIAS += \
 	man/systemd-timedated.8
 
 man/systemd-timedated.8: man/systemd-timedated.service.8
+
+timedatectl_SOURCES = \
+	src/timedate/timedatectl.c
+
+timedatectl_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+timedatectl_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-dbus.la
+
+bin_PROGRAMS += \
+	timedatectl
+
+MANPAGES += \
+	man/timedatectl.1
+
 endif
 
 polkitpolicy_in_files += \
@@ -3574,8 +3649,11 @@ SED_PROCESS = \
 		-e 's,@rootprefix\@,$(rootprefix),g' \
 		-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
 		-e 's,@sushell\@,$(sushell),g' \
+		-e 's,@KILL\@,$(KILL),g' \
 		-e 's,@QUOTAON\@,$(QUOTAON),g' \
 		-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
+		-e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
+		-e 's,@VARLOGDIR\@,$(varlogdir),g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
@@ -3686,6 +3764,30 @@ DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol
 CLEANFILES += \
 	$(dbusinterface_DATA)
 
+if HAVE_SYSV_COMPAT
+sysvinit_DATA = \
+	docs/sysvinit/README
+
+varlog_DATA = \
+	docs/var-log/README
+
+docs/sysvinit/README: docs/sysvinit/README.in
+	$(SED_PROCESS)
+
+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
+
+
 systemd-install-data-hook:
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(tmpfilesdir) \
@@ -3851,6 +3953,7 @@ clean-local:
 	rm -rf $(abs_srcdir)/install-tree
 
 DISTCHECK_CONFIGURE_FLAGS = \
+	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
 	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \