# 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
systemunitdir=$(rootprefix)/lib/systemd/system
systempresetdir=$(rootprefix)/lib/systemd/system-preset
udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir = $(udevlibexecdir)
-udevrulesdir = $(udevlibexecdir)/rules.d
+udevhomedir=$(udevlibexecdir)
+udevrulesdir=$(udevlibexecdir)/rules.d
+udevhwdbdir=$(udevlibexecdir)/hwdb.d
+catalogdir=$(prefix)/lib/systemd/catalog
# And these are the special ones for /
rootprefix=@rootprefix@
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)\" \
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 \
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 \
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 \
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/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 \
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 \
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
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
src/shared/spawn-ask-password-agent.h \
src/shared/specifier.c \
src/shared/specifier.h \
+ src/shared/replace-var.c \
+ src/shared/replace-var.h \
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 += \
test-unit-name \
test-log \
test-unit-file \
- test-date
+ test-date \
+ test-sleep \
+ test-replace-var \
+ test-sched-prio
TESTS += \
test-job-type \
test-strv \
test-unit-name \
test-unit-file \
- test-date
+ test-date \
+ test-sleep \
+ test-replace-var \
+ test-sched-prio
+
+EXTRA_DIST += \
+ test/sched_idle_bad.service \
+ test/sched_idle_ok.service \
+ test/sched_rr_bad.service \
+ test/sched_rr_ok.service \
+ test/sched_rr_change.service
test_engine_SOURCES = \
src/test/test-engine.c
test_unit_file_SOURCES = \
src/test/test-unit-file.c
+test_unit_file_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
test_unit_file_LDADD = \
libsystemd-core.la
test_date_LDADD = \
libsystemd-core.la
+test_sleep_SOURCES = \
+ src/test/test-sleep.c
+
+test_sleep_LDADD = \
+ libsystemd-core.la
+
+test_replace_var_SOURCES = \
+ src/test/test-replace-var.c
+
+test_replace_var_LDADD = \
+ libsystemd-shared.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
test_watchdog_LDADD = \
libsystemd-shared.la
+test_sched_prio_SOURCES = \
+ src/test/test-sched-prio.c
+
+test_sched_prio_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+
+test_sched_prio_LDADD = \
+ libsystemd-core.la \
+ libsystemd-daemon.la
+
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
src/initctl/initctl.c
libsystemd-shared.la
systemd-detect-virt-install-hook:
- $(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+ -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
INSTALL_EXEC_HOOKS += \
systemd-detect-virt-install-hook
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) \
udev-confdirs:
-$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d
+ -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d
INSTALL_DATA_HOOKS += udev-confdirs
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
src/udev/udev-rules.c \
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 \
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
libudev_core_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
- -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
- -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
+ -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+
+if HAVE_BLKID
+libudev_core_la_SOURCES += \
+ src/udev/udev-builtin-blkid.c
+endif
if HAVE_ACL
libudev_core_la_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 \
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 \
# ------------------------------------------------------------------------------
systemd_journald_SOURCES = \
src/journal/journald.c \
- src/journal/journald.h \
- src/journal/journald-kmsg.c \
- src/journal/journald-kmsg.h \
- src/journal/journald-syslog.c \
- src/journal/journald-syslog.h \
- src/journal/journald-stream.c \
- src/journal/journald-stream.h \
- src/journal/journald-console.c \
- src/journal/journald-console.h \
- src/journal/journald-native.c \
- src/journal/journald-native.h \
- src/journal/journald-rate-limit.c \
- src/journal/journald-rate-limit.h \
- src/journal/journal-internal.h
-
-nodist_systemd_journald_SOURCES = \
- src/journal/journald-gperf.c
+ src/journal/journald-server.h
systemd_journald_LDADD = \
- libsystemd-label.la \
- libsystemd-shared.la \
- libsystemd-audit.la \
- libsystemd-daemon.la \
- libsystemd-id128-internal.la \
libsystemd-journal-internal.la \
- libudev.la
-
-if ENABLE_LOGIND
-systemd_journald_LDADD += \
- libsystemd-login-internal.la
-endif
-
-if HAVE_ACL
-systemd_journald_LDADD += \
- libsystemd-acl.la
-endif
+ libsystemd-shared.la \
+ libsystemd-id128-internal.la
systemd_cat_SOURCES = \
src/journal/cat.c
libsystemd-id128-internal.la
test_journal_syslog_SOURCES = \
- src/journal/test-journal-syslog.c \
- src/journal/journald-syslog.c
+ src/journal/test-journal-syslog.c
test_journal_syslog_LDADD = \
- libsystemd-shared.la \
libsystemd-journal-internal.la \
+ libsystemd-shared.la \
libsystemd-id128-internal.la
test_journal_match_SOURCES = \
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
libsystemd-shared.la \
libsystemd-journal-internal.la
+test_catalog_SOURCES = \
+ src/journal/test-catalog.c
+
+test_catalog_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-label.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/systemd/sd-journal.h \
src/journal/journal-send.c \
src/journal/journal-def.h \
src/journal/compress.h \
+ src/journal/catalog.c \
+ src/journal/catalog.h \
src/journal/mmap-cache.c \
src/journal/mmap-cache.h
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
+ libsystemd-label.la \
libsystemd-id128-internal.la
libsystemd_journal_internal_la_SOURCES = \
- $(libsystemd_journal_la_SOURCES)
+ $(libsystemd_journal_la_SOURCES) \
+ src/journal/journald-kmsg.c \
+ src/journal/journald-kmsg.h \
+ src/journal/journald-syslog.c \
+ src/journal/journald-syslog.h \
+ src/journal/journald-stream.c \
+ src/journal/journald-stream.h \
+ src/journal/journald-server.c \
+ src/journal/journald-server.h \
+ src/journal/journald-console.c \
+ src/journal/journald-console.h \
+ src/journal/journald-native.c \
+ src/journal/journald-native.h \
+ src/journal/journald-rate-limit.c \
+ src/journal/journald-rate-limit.h \
+ src/journal/journal-internal.h
libsystemd_journal_internal_la_CFLAGS = \
$(AM_CFLAGS)
-libsystemd_journal_internal_la_LIBADD =
+libsystemd_journal_internal_la_LIBADD = \
+ libsystemd-label.la \
+ libsystemd-audit.la \
+ libsystemd-daemon.la \
+ libudev.la \
+ libsystemd-shared.la \
+ libsystemd-label.la
+
+nodist_libsystemd_journal_internal_la_SOURCES = \
+ src/journal/journald-gperf.c
+
+if ENABLE_LOGIND
+libsystemd_journal_internal_la_LIBADD += \
+ libsystemd-login-internal.la
+endif
+
+if HAVE_ACL
+libsystemd_journal_internal_la_LIBADD += \
+ libsystemd-acl.la
+endif
if HAVE_XZ
libsystemd_journal_la_SOURCES += \
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
+# Update catalog on installation / deinstallation. Do not bother if installing
+# in DESTDIR, since this is likely for packaging purposes.
+# Ignore failure, since there are other reasons why it might not work,
+# like running under distcheck.
+catalog-update-hook:
+ -test -n "$(DESTDIR)" || journalctl --update-catalog
+
+INSTALL_DATA_HOOKS += \
+ catalog-update-hook
+
+
noinst_PROGRAMS += \
test-journal \
test-journal-send \
test-journal-syslog \
test-journal-match \
+ test-journal-enum \
test-journal-stream \
test-journal-verify \
- test-mmap-cache
+ test-mmap-cache \
+ test-catalog
TESTS += \
test-journal \
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
+dist_catalog_DATA = \
+ catalog/systemd.catalog
+
journal-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
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) \
--enable-gtk-doc
endif
+hwdb-update:
+ ( cd hwdb && \
+ wget -N http://www.linux-usb.org/usb.ids && \
+ wget -N http://pci-ids.ucw.cz/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/
~ianmdlvl / elogind.git / blobdiff