X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e4c7e564f0657f19cec6b8ada68095c354bbb4f3;hp=135d9f8ab19b8ca9f7740f221255f0250fa3b6f0;hb=c67fbe4c71977de14ebd09a8c250ef8091dff231;hpb=b5b46d599524341ddd7407e5dff1021af8ff5089 diff --git a/Makefile.am b/Makefile.am index 135d9f8ab..e4c7e564f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,29 +26,29 @@ SUBDIRS = . po # remove targets if the command fails .DELETE_ON_ERROR: -LIBUDEV_CURRENT=2 +LIBUDEV_CURRENT=3 LIBUDEV_REVISION=0 -LIBUDEV_AGE=1 +LIBUDEV_AGE=2 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=3 -LIBSYSTEMD_LOGIN_REVISION=3 +LIBSYSTEMD_LOGIN_REVISION=9 LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 -LIBSYSTEMD_DAEMON_REVISION=4 +LIBSYSTEMD_DAEMON_REVISION=5 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=9 +LIBSYSTEMD_ID128_REVISION=15 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=4 -LIBSYSTEMD_JOURNAL_REVISION=1 -LIBSYSTEMD_JOURNAL_AGE=4 +LIBSYSTEMD_JOURNAL_CURRENT=6 +LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_AGE=6 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -61,10 +61,13 @@ 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 userunitdir=$(prefix)/lib/systemd/user +userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d usergeneratordir=$(prefix)/lib/systemd/user-generators @@ -73,9 +76,11 @@ systemgeneratordir=$(rootlibexecdir)/system-generators systemshutdowndir=$(rootlibexecdir)/system-shutdown systemsleepdir=$(rootlibexecdir)/system-sleep systemunitdir=$(rootprefix)/lib/systemd/system +systempresetdir=$(rootprefix)/lib/systemd/system-preset udevlibexecdir=$(rootprefix)/lib/udev udevhomedir = $(udevlibexecdir) udevrulesdir = $(udevlibexecdir)/rules.d +udevhwdbdir = $(udevlibexecdir)/hwdb.d # And these are the special ones for / rootprefix=@rootprefix@ @@ -112,7 +117,6 @@ udevlibexec_PROGRAMS = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \ -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \ -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \ @@ -158,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 @@ -244,7 +241,7 @@ systemgenerator_PROGRAMS = \ systemd-system-update-generator dist_bashcompletion_DATA = \ - bash-completion/systemd-bash-completion.sh + shell-completion/systemd-bash-completion.sh dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ @@ -275,7 +272,7 @@ dist_systemunit_DATA = \ units/nss-user-lookup.target \ units/mail-transfer-agent.target \ units/hibernate.target \ - units/http-daemon.target \ + units/hybrid-sleep.target \ units/poweroff.target \ units/reboot.target \ units/rescue.target \ @@ -331,6 +328,7 @@ nodist_systemunit_DATA = \ units/rescue.service \ units/user@.service \ units/systemd-hibernate.service \ + units/systemd-hybrid-sleep.service \ units/systemd-suspend.service \ units/systemd-halt.service \ units/systemd-poweroff.service \ @@ -381,7 +379,9 @@ EXTRA_DIST += \ units/systemd-udev-settle.service \ 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 \ introspect.awk \ man/custom-html.xsl @@ -468,7 +468,7 @@ MANPAGES = \ man/systemd.conf.5 \ man/tmpfiles.d.5 \ man/hostname.5 \ - man/timezone.5 \ + man/localtime.5 \ man/machine-id.5 \ man/locale.conf.5 \ man/os-release.5 \ @@ -484,6 +484,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 \ @@ -515,7 +516,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 \ @@ -533,6 +535,7 @@ MANPAGES_ALIAS = \ man/systemd-shutdownd.socket.8 \ man/systemd-shutdownd.8 \ man/systemd-hibernate.service.8 \ + man/systemd-hybrid-sleep.service.8 \ man/systemd-sleep.8 \ man/systemd-shutdown.8 \ man/systemd-poweroff.service.8 \ @@ -548,6 +551,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 \ @@ -574,6 +578,7 @@ MANPAGES_ALIAS = \ man/SD_JOURNAL_FOREACH_DATA.3 \ man/sd_journal_get_monotonic_usec.3 \ man/sd_journal_get_cutoff_monotonic_usec.3 \ + man/sd_journal_reliable_fd.3 \ man/sd_journal_process.3 \ man/sd_journal_wait.3 \ man/SD_JOURNAL_NOP.3 \ @@ -584,7 +589,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 @@ -601,6 +610,7 @@ man/systemd-initctl.8: man/systemd-initctl.service.8 man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8 man/systemd-shutdownd.8: man/systemd-shutdownd.service.8 man/systemd-hibernate.service.8: man/systemd-suspend.service.8 +man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8 man/systemd-sleep.8: man/systemd-suspend.service.8 man/systemd-shutdown.8: man/systemd-halt.service.8 man/systemd-poweroff.service.8: man/systemd-halt.service.8 @@ -616,6 +626,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 @@ -642,6 +653,7 @@ man/sd_journal_restart_data.3: man/sd_journal_get_data.3 man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3 man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3 man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3 +man/sd_journal_reliable_fd.3: man/sd_journal_get_fd.3 man/sd_journal_process.3: man/sd_journal_get_fd.3 man/sd_journal_wait.3: man/sd_journal_get_fd.3 man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3 @@ -653,6 +665,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)}}}}} @@ -681,8 +697,36 @@ 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 + +XML_DIRECTIVE_FILES = \ + man/systemd.unit.xml \ + man/systemd.service.xml \ + man/systemd.socket.xml \ + man/systemd.mount.xml \ + man/systemd.automount.xml \ + man/systemd.swap.xml \ + man/systemd.target.xml \ + man/systemd.path.xml \ + man/systemd.timer.xml \ + man/systemd.snapshot.xml \ + man/systemd.exec.xml \ + man/systemd.kill.xml \ + man/systemd.device.xml \ + man/systemd.conf.xml \ + man/systemd.journal-fields.xml + +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.directives.xml + endif endif @@ -692,7 +736,8 @@ EXTRA_DIST += \ ${XML_FILES:.xml=.html} \ $(MANPAGES) \ $(MANPAGES_ALIAS) \ - make-man-index.py + make-man-index.py \ + make-directive-index.py # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -707,6 +752,7 @@ libsystemd_shared_la_SOURCES = \ src/shared/list.h \ src/shared/macro.h \ src/shared/def.h \ + src/shared/sparse-endian.h \ src/shared/util.c \ src/shared/util.h \ src/shared/virt.c \ @@ -719,6 +765,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 \ @@ -753,7 +801,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/spawn-polkit-agent.c \ src/shared/spawn-polkit-agent.h \ src/shared/hwclock.c \ - src/shared/hwclock.h + src/shared/hwclock.h \ + src/shared/time-dst.c \ + src/shared/time-dst.h #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -797,6 +847,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 \ @@ -877,6 +929,8 @@ noinst_LTLIBRARIES += \ libsystemd_core_la_SOURCES = \ src/core/unit.c \ src/core/unit.h \ + src/core/unit-printf.c \ + src/core/unit-printf.h \ src/core/job.c \ src/core/job.h \ src/core/manager.c \ @@ -945,6 +999,8 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-path.h \ src/core/cgroup.c \ src/core/cgroup.h \ + src/core/selinux-access.c \ + src/core/selinux-access.h \ src/core/selinux-setup.c \ src/core/selinux-setup.h \ src/core/ima-setup.c \ @@ -982,7 +1038,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 \ @@ -1004,6 +1062,7 @@ libsystemd_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-dbus.la \ + libsystemd-audit.la \ libsystemd-id128-internal.la \ libudev.la \ $(LIBWRAP_LIBS) \ @@ -1121,14 +1180,18 @@ noinst_PROGRAMS += \ test-watchdog \ test-unit-name \ test-log \ - test-unit-file + test-unit-file \ + test-date \ + test-sleep TESTS += \ test-job-type \ test-env-replace \ test-strv \ test-unit-name \ - test-unit-file + test-unit-file \ + test-date \ + test-sleep test_engine_SOURCES = \ src/test/test-engine.c @@ -1190,6 +1253,18 @@ test_log_SOURCES = \ test_log_LDADD = \ libsystemd-core.la +test_date_SOURCES = \ + src/test/test-date.c + +test_date_LDADD = \ + libsystemd-core.la + +test_sleep_SOURCES = \ + src/test/test-sleep.c + +test_sleep_LDADD = \ + libsystemd-core.la + test_daemon_SOURCES = \ src/test/test-daemon.c @@ -1369,6 +1444,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 @@ -1620,7 +1701,9 @@ libudev_la_SOURCES =\ src/libudev/libudev-device.c \ src/libudev/libudev-enumerate.c \ src/libudev/libudev-monitor.c \ - src/libudev/libudev-queue.c + src/libudev/libudev-queue.c \ + src/libudev/libudev-hwdb-def.h \ + src/libudev/libudev-hwdb.c libudev_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1693,6 +1776,7 @@ man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 udev-confdirs: -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d + -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d INSTALL_DATA_HOOKS += udev-confdirs @@ -1705,12 +1789,18 @@ dist_udevrules_DATA += \ rules/60-persistent-input.rules \ rules/60-persistent-alsa.rules \ rules/60-persistent-storage.rules \ + rules/64-btrfs.rules \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ rules/80-drivers.rules \ rules/95-udev-late.rules +dist_udevhwdb_DATA = \ + hwdb/20-pci-vendor-product.hwdb \ + hwdb/20-usb-vendor-product.hwdb \ + hwdb/20-acpi-vendor.hwdb + udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = \ src/udev/udev.conf @@ -1765,6 +1855,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-ctrl.c \ src/udev/udev-builtin.c \ src/udev/udev-builtin-blkid.c \ + src/udev/udev-builtin-btrfs.c \ src/udev/udev-builtin-firmware.c \ src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-input_id.c \ @@ -1787,8 +1878,7 @@ libudev_core_la_LIBADD = \ libudev_core_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \ - -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\" + -DFIRMWARE_PATH="$(FIRMWARE_PATH)" if HAVE_ACL libudev_core_la_SOURCES += \ @@ -1811,6 +1901,7 @@ udevadm_SOURCES = \ src/udev/udevadm-info.c \ src/udev/udevadm-control.c \ src/udev/udevadm-monitor.c \ + src/udev/udevadm-hwdb.c \ src/udev/udevadm-settle.c \ src/udev/udevadm-trigger.c \ src/udev/udevadm-test.c \ @@ -2179,6 +2270,7 @@ dist_udevkeymap_DATA = \ keymaps/hewlett-packard-presario-2100 \ keymaps/hewlett-packard-tablet \ keymaps/hewlett-packard-tx2 \ + keymaps/hewlett-packard_elitebook-8440p \ keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ keymaps/inventec-symphony_6.0_7.0 \ keymaps/lenovo-3000 \ @@ -2394,6 +2486,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 @@ -2410,6 +2509,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 @@ -2418,6 +2526,14 @@ test_journal_match_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la +test_journal_enum_SOURCES = \ + src/journal/test-journal-enum.c + +test_journal_enum_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + test_journal_stream_SOURCES = \ src/journal/test-journal-stream.c @@ -2434,6 +2550,13 @@ test_journal_verify_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la +test_mmap_cache_SOURCES = \ + src/journal/test-mmap-cache.c + +test_mmap_cache_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la + libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ src/systemd/sd-journal.h \ @@ -2446,7 +2569,6 @@ libsystemd_journal_la_SOURCES = \ src/journal/lookup3.c \ src/journal/lookup3.h \ src/journal/journal-send.c \ - src/journal/sparse-endian.h \ src/journal/journal-def.h \ src/journal/compress.h \ src/journal/mmap-cache.c \ @@ -2536,15 +2658,21 @@ UNINSTALL_EXEC_HOOKS += \ noinst_PROGRAMS += \ test-journal \ test-journal-send \ + test-journal-syslog \ test-journal-match \ + test-journal-enum \ test-journal-stream \ - test-journal-verify + test-journal-verify \ + test-mmap-cache TESTS += \ test-journal \ + test-journal-send \ + test-journal-syslog \ test-journal-match \ test-journal-stream \ - test-journal-verify + test-journal-verify \ + test-mmap-cache pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -2563,6 +2691,7 @@ rootbin_PROGRAMS += \ journalctl bin_PROGRAMS += \ + systemd-coredumpctl \ systemd-cat dist_systemunit_DATA += \ @@ -2603,6 +2732,43 @@ EXTRA_DIST += \ CLEANFILES += \ src/journal/journald-gperf.c +if HAVE_MICROHTTPD + +gatewayddocumentrootdir=$(pkgdatadir)/gatewayd + +rootlibexec_PROGRAMS += \ + systemd-journal-gatewayd + +systemd_journal_gatewayd_SOURCES = \ + src/journal/journal-gatewayd.c + +systemd_journal_gatewayd_LDADD = \ + libsystemd-shared.la \ + libsystemd-logs.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon.la \ + $(MICROHTTPD_LIBS) + +systemd_journal_gatewayd_CFLAGS = \ + -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \ + $(AM_CFLAGS) \ + $(MICROHTTPD_CFLAGS) + +dist_systemunit_DATA += \ + units/systemd-journal-gatewayd.socket + +nodist_systemunit_DATA += \ + units/systemd-journal-gatewayd.service + +dist_gatewayddocumentroot_DATA = \ + src/journal/browse.html + +endif + +EXTRA_DIST += \ + units/systemd-journal-gatewayd.service.in + # ------------------------------------------------------------------------------ if ENABLE_COREDUMP systemd_coredump_SOURCES = \ @@ -2794,6 +2960,9 @@ endif EXTRA_DIST += \ units/systemd-quotacheck.service.in +nodist_systemunit_DATA += \ + units/quotaon.service + # ------------------------------------------------------------------------------ if ENABLE_RANDOMSEED rootlibexec_PROGRAMS += \ @@ -2945,6 +3114,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 += \ @@ -3016,6 +3204,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 += \ @@ -3079,6 +3285,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 += \ @@ -3310,8 +3534,7 @@ systemd_multi_seat_x_SOURCES = \ systemd_multi_seat_x_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la \ - libudev.la + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-multi-seat-x @@ -3404,6 +3627,37 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ +if HAVE_PYTHON_DEVEL + +pkgpyexec_LTLIBRARIES = \ + _journal.la + +_journal_la_SOURCES = \ + src/python-systemd/_journal.c + +_journal_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + $(PYTHON_CFLAGS) + +_journal_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -shared \ + -module \ + -avoid-version + +_journal_la_LIBADD = \ + $(PYTHON_LIBS) \ + libsystemd-journal.la + +dist_pkgpyexec_PYTHON = \ + src/python-systemd/journal.py \ + src/python-systemd/__init__.py + +endif + +# ------------------------------------------------------------------------------ + SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ @@ -3415,6 +3669,8 @@ SED_PROCESS = \ -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ -e 's,@systemunitdir\@,$(systemunitdir),g' \ -e 's,@userunitdir\@,$(userunitdir),g' \ + -e 's,@systempresetdir\@,$(systempresetdir),g' \ + -e 's,@userpresetdir\@,$(userpresetdir),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ @@ -3427,6 +3683,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 @@ -3537,6 +3798,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) \ @@ -3700,8 +3985,10 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS) clean-local: rm -rf $(abs_srcdir)/install-tree + rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids 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) \ @@ -3715,6 +4002,12 @@ DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif +hwdb-update: + ( cd hwdb && \ + wget -N http://www.linux-usb.org/usb.ids && \ + wget -N http://pciids.sourceforge.net/v2.2/pci.ids && \ + ./ids-update.pl ) + upload: all distcheck cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/