X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=823bf03dd0a654d3804dc726c87a6e4cbc67dd3f;hp=c23afdf17317a3742c59f8d88dd289d7d88808f4;hb=5b4882b6aa4f61e5b2b207d8f417c60a6427e1c8;hpb=c6511e859c35b12de4e6fb5f58d7258d9de3b8f2 diff --git a/Makefile.am b/Makefile.am index c23afdf17..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 \ @@ -544,6 +548,7 @@ MANPAGES_ALIAS = \ man/systemd-tmpfiles-clean.timer.8 \ man/sd_id128_t.3 \ man/SD_ID128_MAKE.3 \ + man/SD_ID128_CONST_STR.3 \ man/SD_ID128_FORMAT_STR.3 \ man/SD_ID128_FORMAT_VAL.3 \ man/sd_id128_equal.3 \ @@ -581,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 @@ -613,6 +621,7 @@ man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8 man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8 man/sd_id128_t.3: man/sd-id128.3 man/SD_ID128_MAKE.3: man/sd-id128.3 +man/SD_ID128_CONST_STR.3: man/sd-id128.3 man/SD_ID128_FORMAT_STR.3: man/sd-id128.3 man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3 man/sd_id128_equal.3: man/sd-id128.3 @@ -651,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)}}}}} @@ -746,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 \ @@ -1157,14 +1171,16 @@ noinst_PROGRAMS += \ test-watchdog \ test-unit-name \ test-log \ - test-unit-file + test-unit-file \ + test-date TESTS += \ test-job-type \ test-env-replace \ test-strv \ test-unit-name \ - test-unit-file + test-unit-file \ + test-date test_engine_SOURCES = \ src/test/test-engine.c @@ -1226,6 +1242,12 @@ test_log_SOURCES = \ test_log_LDADD = \ libsystemd-core.la +test_date_SOURCES = \ + src/test/test-date.c + +test_date_LDADD = \ + libsystemd-core.la + test_daemon_SOURCES = \ src/test/test-daemon.c @@ -2438,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 @@ -2454,6 +2483,15 @@ test_journal_send_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la +test_journal_syslog_SOURCES = \ + src/journal/test-journal-syslog.c \ + src/journal/journald-syslog.c + +test_journal_syslog_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + test_journal_match_SOURCES = \ src/journal/test-journal-match.c @@ -2587,6 +2625,7 @@ UNINSTALL_EXEC_HOOKS += \ noinst_PROGRAMS += \ test-journal \ test-journal-send \ + test-journal-syslog \ test-journal-match \ test-journal-stream \ test-journal-verify \ @@ -2594,6 +2633,8 @@ noinst_PROGRAMS += \ TESTS += \ test-journal \ + test-journal-send \ + test-journal-syslog \ test-journal-match \ test-journal-stream \ test-journal-verify \ @@ -2616,6 +2657,7 @@ rootbin_PROGRAMS += \ journalctl bin_PROGRAMS += \ + systemd-coredumpctl \ systemd-cat dist_systemunit_DATA += \ @@ -2679,9 +2721,6 @@ systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ $(MICROHTTPD_CFLAGS) -EXTRA_DIST += \ - units/systemd-journal-gatewayd.service.in - dist_systemunit_DATA += \ units/systemd-journal-gatewayd.socket @@ -2693,6 +2732,9 @@ dist_gatewayddocumentroot_DATA = \ endif +EXTRA_DIST += \ + units/systemd-journal-gatewayd.service.in + # ------------------------------------------------------------------------------ if ENABLE_COREDUMP systemd_coredump_SOURCES = \ @@ -3038,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 += \ @@ -3109,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 += \ @@ -3172,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 += \ @@ -3552,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 @@ -3664,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) \ @@ -3829,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) \