udev: hwdb - add usb class descriptions

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9a054ae93526747f9453dad4c6e3ce2296ffec90..2c84fe1c7e4a1d714a77655bfa977d80c2d6e966 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
@@ -1798,8 +1798,11 @@ dist_udevrules_DATA += \
 
 dist_udevhwdb_DATA = \
        hwdb/20-pci-vendor-product.hwdb \
+       hwdb/20-pci-classes.hwdb \
        hwdb/20-usb-vendor-product.hwdb \
-       hwdb/20-acpi-vendor.hwdb
+       hwdb/20-usb-classes.hwdb \
+       hwdb/20-acpi-vendor.hwdb \
+       hwdb/20-OUI.hwdb
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
@@ -1860,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
@@ -3985,7 +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
+       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) \
@@ -4006,6 +4010,7 @@ 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