chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
man: add man page for localectl
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f7249987d1b8d864434f832041d98005a320aff2..d39e3b62ffa2e5efb4415f2ec02b249de5bd128a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=5
 LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
@@ -35,7 +35,7 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=6
+LIBSYSTEMD_LOGIN_REVISION=8
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -43,11 +43,11 @@ LIBSYSTEMD_DAEMON_REVISION=5
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=12
+LIBSYSTEMD_ID128_REVISION=14
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=5
-LIBSYSTEMD_JOURNAL_REVISION=2
+LIBSYSTEMD_JOURNAL_REVISION=4
 LIBSYSTEMD_JOURNAL_AGE=5
 
 # Dirs of external packages
@@ -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
@@ -160,43 +162,36 @@ AM_LDFLAGS = $(OUR_LDFLAGS)
 if TARGET_GENTOO
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_ARCH
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_FRUGALWARE
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_MANDRIVA
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DKBD_SETFONT=\"/bin/setfont\"
 else
 if TARGET_ANGSTROM
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_MAGEIA
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DKBD_SETFONT=\"/bin/setfont\"
 else
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+       -DKBD_SETFONT=\"/bin/setfont\"
 endif
 endif
 endif
@@ -487,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 \
@@ -518,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 \
@@ -551,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 \
@@ -587,7 +585,11 @@ MANPAGES_ALIAS = \
        man/sd_journal_seek_tail.3 \
        man/sd_journal_seek_monotonic_usec.3 \
        man/sd_journal_seek_realtime_usec.3 \
-       man/sd_journal_seek_cursor.3
+       man/sd_journal_seek_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
@@ -619,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
@@ -656,6 +659,10 @@ man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
 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)}}}}}
@@ -829,6 +836,8 @@ libsystemd_label_la_SOURCES = \
        src/shared/socket-label.c \
        src/shared/label.c \
        src/shared/label.h \
+       src/shared/selinux-util.c \
+       src/shared/selinux-util.h \
        src/shared/mkdir.c \
        src/shared/mkdir.h \
        src/shared/ask-password-api.c \
@@ -1018,7 +1027,9 @@ libsystemd_core_la_SOURCES = \
        src/core/killall.h \
        src/core/killall.c \
        src/core/syscall-list.c \
-       src/core/syscall-list.h
+       src/core/syscall-list.h \
+       src/core/audit-fd.c \
+       src/core/audit-fd.h
 
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
@@ -1158,14 +1169,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
@@ -1227,6 +1240,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
 
@@ -1406,6 +1425,12 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
        libsystemd-shared.la
 
+systemd-detect-virt-install-hook:
+       $(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+
+INSTALL_EXEC_HOOKS += \
+       systemd-detect-virt-install-hook
+
 # ------------------------------------------------------------------------------
 systemd_delta_SOURCES = \
        src/delta/delta.c
@@ -2433,6 +2458,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
 
@@ -2449,6 +2481,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
 
@@ -2582,6 +2623,7 @@ UNINSTALL_EXEC_HOOKS += \
 noinst_PROGRAMS += \
        test-journal \
        test-journal-send \
+       test-journal-syslog \
        test-journal-match \
        test-journal-stream \
        test-journal-verify \
@@ -2589,6 +2631,8 @@ noinst_PROGRAMS += \
 
 TESTS += \
        test-journal \
+       test-journal-send \
+       test-journal-syslog \
        test-journal-match \
        test-journal-stream \
        test-journal-verify \
@@ -2611,6 +2655,7 @@ rootbin_PROGRAMS += \
        journalctl
 
 bin_PROGRAMS += \
+       systemd-coredumpctl \
        systemd-cat
 
 dist_systemunit_DATA += \
@@ -2674,9 +2719,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
 
@@ -2688,6 +2730,9 @@ dist_gatewayddocumentroot_DATA = \
 
 endif
 
+EXTRA_DIST += \
+       units/systemd-journal-gatewayd.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3033,6 +3078,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 += \
@@ -3104,6 +3168,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 += \
@@ -3167,6 +3249,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 += \
@@ -3547,8 +3647,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
@@ -3659,6 +3762,26 @@ 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
+
+endif
+
+
 systemd-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
Unnamed repository; edit this file 'description' to name the repository.