X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=2898602dc25314dd859396b33c35fe6b568201a1;hp=e86e6347eda45036f182104b8f2acf8322d936b1;hb=87281abdf3ed609b6416cabac00927bd0f26ccd9;hpb=2087a7aff26ea5d1bc2c7c29add3275328f36baa diff --git a/Makefile.am b/Makefile.am index e86e6347e..2898602dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,16 +26,16 @@ SUBDIRS = . po # remove targets if the command fails .DELETE_ON_ERROR: -LIBUDEV_CURRENT=2 -LIBUDEV_REVISION=5 -LIBUDEV_AGE=1 +LIBUDEV_CURRENT=3 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=2 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=3 -LIBSYSTEMD_LOGIN_REVISION=8 +LIBSYSTEMD_LOGIN_REVISION=9 LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 @@ -43,12 +43,12 @@ LIBSYSTEMD_DAEMON_REVISION=5 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=14 +LIBSYSTEMD_ID128_REVISION=15 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=5 -LIBSYSTEMD_JOURNAL_REVISION=4 -LIBSYSTEMD_JOURNAL_AGE=5 +LIBSYSTEMD_JOURNAL_CURRENT=6 +LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_AGE=6 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -80,6 +80,7 @@ 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@ @@ -116,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)\" \ @@ -241,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 \ @@ -272,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 \ @@ -328,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 \ @@ -378,6 +379,7 @@ 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 \ @@ -482,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 \ @@ -532,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 \ @@ -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 \ @@ -605,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 @@ -647,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 @@ -745,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 \ @@ -757,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 \ @@ -791,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 += \ @@ -1169,7 +1181,8 @@ noinst_PROGRAMS += \ test-unit-name \ test-log \ test-unit-file \ - test-date + test-date \ + test-sleep TESTS += \ test-job-type \ @@ -1177,7 +1190,8 @@ TESTS += \ test-strv \ test-unit-name \ test-unit-file \ - test-date + test-date \ + test-sleep test_engine_SOURCES = \ src/test/test-engine.c @@ -1245,6 +1259,12 @@ test_date_SOURCES = \ 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 @@ -1681,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) \ @@ -1754,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 @@ -1773,6 +1796,12 @@ dist_udevrules_DATA += \ 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 \ + hwdb/20-OUI.hwdb + udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = \ src/udev/udev.conf @@ -1850,8 +1879,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 += \ @@ -1874,6 +1902,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 \ @@ -2242,6 +2271,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 \ @@ -2457,6 +2487,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 @@ -2490,6 +2527,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 @@ -2525,7 +2570,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 \ @@ -2617,6 +2661,7 @@ noinst_PROGRAMS += \ test-journal-send \ test-journal-syslog \ test-journal-match \ + test-journal-enum \ test-journal-stream \ test-journal-verify \ test-mmap-cache @@ -2647,6 +2692,7 @@ rootbin_PROGRAMS += \ journalctl bin_PROGRAMS += \ + systemd-coredumpctl \ systemd-cat dist_systemunit_DATA += \ @@ -3174,8 +3220,8 @@ localectl_LDADD = \ bin_PROGRAMS += \ localectl -#MANPAGES += \ -# man/localectl.1 +MANPAGES += \ + man/localectl.1 endif @@ -3770,6 +3816,10 @@ EXTRA_DIST += \ docs/sysvinit/README.in \ docs/var-log/README.in +CLEANFILES += \ + docs/sysvinit/README \ + docs/var-log/README + endif @@ -3936,8 +3986,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 $(abs_srcdir)/hwdb/oui.txt 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) \ @@ -3951,6 +4003,13 @@ 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 && \ + wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \ + ./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/