X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=634c67d13f971f41e5799e861d781d51431f1e12;hb=85210bffd8363e491b4c31f2d09404f9869ad0c7;hp=da46e583b528315e53b9712a3c66bd1cb5023d0c;hpb=139ee8cc316a861bcc8a8ebdf4a8449dffe16f79;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index da46e583b..634c67d13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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@
@@ -575,6 +576,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 \
@@ -648,6 +650,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
@@ -1758,6 +1761,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 +1781,11 @@ 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
+
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
 	src/udev/udev.conf
@@ -1824,6 +1833,7 @@ noinst_LTLIBRARIES += \
 
 libudev_core_la_SOURCES = \
 	src/udev/udev.h \
+	src/udev/udev-hwdb.h \
 	src/udev/udev-event.c \
 	src/udev/udev-watch.c \
 	src/udev/udev-node.c \
@@ -1854,8 +1864,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 +1887,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 +2256,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 +2512,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 +2646,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 +3971,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
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
@@ -3967,6 +3988,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/