X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=2c84fe1c7e4a1d714a77655bfa977d80c2d6e966;hp=da46e583b528315e53b9712a3c66bd1cb5023d0c;hb=8db6dcfd3c3d19d35767f04884a99368f6c64b36;hpb=139ee8cc316a861bcc8a8ebdf4a8449dffe16f79 diff --git a/Makefile.am b/Makefile.am index da46e583b..2c84fe1c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,9 +26,9 @@ SUBDIRS = . po # remove targets if the command fails .DELETE_ON_ERROR: -LIBUDEV_CURRENT=2 -LIBUDEV_REVISION=6 -LIBUDEV_AGE=1 +LIBUDEV_CURRENT=3 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=2 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=2 @@ -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 \ @@ -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 \ @@ -575,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 \ @@ -606,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 @@ -648,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 @@ -795,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 += \ @@ -1173,7 +1181,8 @@ noinst_PROGRAMS += \ test-unit-name \ test-log \ test-unit-file \ - test-date + test-date \ + test-sleep TESTS += \ test-job-type \ @@ -1181,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 @@ -1249,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 @@ -1685,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) \ @@ -1758,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 @@ -1777,6 +1796,14 @@ dist_udevrules_DATA += \ rules/80-drivers.rules \ rules/95-udev-late.rules +dist_udevhwdb_DATA = \ + hwdb/20-pci-vendor-product.hwdb \ + hwdb/20-pci-classes.hwdb \ + hwdb/20-usb-vendor-product.hwdb \ + hwdb/20-usb-classes.hwdb \ + hwdb/20-acpi-vendor.hwdb \ + hwdb/20-OUI.hwdb + udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = \ src/udev/udev.conf @@ -1836,6 +1863,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-kmod.c \ + src/udev/udev-builtin-net_id.c \ src/udev/udev-builtin-path_id.c \ src/udev/udev-builtin-usb_id.c \ src/libsystemd-daemon/sd-daemon.c @@ -1854,8 +1882,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 += \ @@ -1878,6 +1905,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 \ @@ -2246,6 +2274,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 \ @@ -2501,6 +2530,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 @@ -2627,6 +2664,7 @@ noinst_PROGRAMS += \ test-journal-send \ test-journal-syslog \ test-journal-match \ + test-journal-enum \ test-journal-stream \ test-journal-verify \ test-mmap-cache @@ -3951,6 +3989,7 @@ 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) \ @@ -3967,6 +4006,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/