Update.

[oweals/hwids.git] / Makefile

diff --git a/Makefile b/Makefile
index 15d62deba3c17520a5517a1101db55b9bcca1742..19f604686377c115a144a033733468b7331cbf59 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+
 ifeq "$(V)" "0"
   STATUS = git status -s
   Q=@
@@ -6,28 +7,48 @@ else
   Q=
 endif
 
-ifeq "$(UDEV)" "yes"
-  ALL_TARGETS="compress udev-hwdb"
-  INSTALL_TARGETS="install-base install-hwdb"
-else
-  ALL_TARGETS="compress"
-  INSTALL_TARGETS="install-base"
-endif
+PKG_CONFIG ?= pkg-config
+GZIP ?= yes
+NET ?= yes
+PCI ?= yes
+UDEV ?= no
+USB ?= yes
+
+COMPRESS_FILES-yes =
+COMPRESS_FILES-$(PCI) += pci.ids.gz
+COMPRESS_FILES-$(USB) += usb.ids.gz
 
-all: $(ALL_TARGETS)
+DATA_FILES-yes =
+DATA_FILES-$(GZIP) += $(COMPRESS_FILES-yes)
+DATA_FILES-$(NET) += oui.txt iab.txt
+DATA_FILES-$(PCI) += pci.ids
+DATA_FILES-$(USB) += usb.ids
 
-install: $(INSTALL_TARGETS)
+ALL_TARGETS-yes =
+ALL_TARGETS-$(GZIP) += $(COMPRESS_FILES-yes)
+ALL_TARGETS-$(UDEV) += udev-hwdb
+
+INSTALL_TARGETS-yes = install-base
+INSTALL_TARGETS-$(UDEV) += install-hwdb
+
+all: $(ALL_TARGETS-yes)
+
+install: $(INSTALL_TARGETS-yes)
 
 fetch:
        $(Q)curl -z pci.ids -o pci.ids -R http://pci-ids.ucw.cz/v2.2/pci.ids
        $(Q)curl -z usb.ids -o usb.ids -R http://www.linux-usb.org/usb.ids
        $(Q)curl -z oui.txt -o oui.txt -R http://standards.ieee.org/develop/regauth/oui/oui.txt
        $(Q)curl -z iab.txt -o iab.txt -R http://standards.ieee.org/develop/regauth/iab/iab.txt
+       $(Q)curl -z sdio.ids -o sdio.ids -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/sdio.ids
        $(Q)curl -z udev/20-acpi-vendor.hwdb -o udev/20-acpi-vendor.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-acpi-vendor.hwdb
+       $(Q)curl -z udev/20-bluetooth-vendor-product.hwdb -o udev/20-bluetooth-vendor-product.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-bluetooth-vendor-product.hwdb
+       $(Q)curl -z udev/20-net-ifname.hwdb -o udev/20-net-ifname.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/20-net-ifname.hwdb
+       $(Q)curl -z udev/60-keyboard.hwdb -o udev/60-keyboard.hwdb -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/60-keyboard.hwdb
        $(Q)curl -z udev-hwdb-update.pl -o udev-hwdb-update.pl -R http://cgit.freedesktop.org/systemd/systemd/plain/hwdb/ids-update.pl
        $(Q)$(STATUS)
 
-PV ?= $(shell ( awk '$$2 == "Date:" { print $$3; nextfile }' pci.ids usb.ids; git log --format=format:%ci -1 -- oui.txt hwdb/20-acpi-vendor.hwdb udev-hwdb-update.pl | cut -d ' ' -f1; ) | sort | tail -n 1 | tr -d -)
+PV ?= $(shell ( awk '$$2 == "Date:" { print $$3; nextfile }' pci.ids usb.ids; git log --format=format:%ci -1 -- oui.txt udev/20-acpi-vendor.hwdb udev/20-bluetooth-vendor-product.hwdb udev/20-net-ifname.hwdb udev/60-keyboard.hwdb udev-hwdb-update.pl | cut -d ' ' -f1; ) | sort | tail -n 1 | tr -d -)
 P = hwids-$(PV)
 
 tag:
@@ -42,19 +63,18 @@ compress: pci.ids.gz usb.ids.gz
        gzip -c $< > $@
 
 MISCDIR=/usr/share/misc
-HWDBDIR=/usr/lib/udev/hwdb.d
+HWDBDIR=$(shell $(PKG_CONFIG) --variable=udevdir udev)/hwdb.d
 DOCDIR=/usr/share/doc/hwids
 
-install-base: compress
+install-base: $(DATA_FILES-yes)
        mkdir -p $(DESTDIR)$(DOCDIR)
-       install -p README.md $(DESTDIR)$(DOCDIR)
+       install -p -m 644 README.md $(DESTDIR)$(DOCDIR)
+ifneq ($(strip $(DATA_FILES-yes)),)
        mkdir -p $(DESTDIR)$(MISCDIR)
-       for file in {usb,pci}.ids{,.gz} {oui,iab}.txt; do \
-               install -p $$file $(DESTDIR)$(MISCDIR)
-       done
+       install -p -m 644 $(DATA_FILES-yes) $(DESTDIR)$(MISCDIR)
+endif
 
-install-udev:
+install-hwdb:
        mkdir -p $(DESTDIR)$(HWDBDIR)
-       for file in udev/*.hwdb; do \
-               install -p $$file $(DESTDIR)$(HWDBDIR)
-       done
+       install -p -m 644 udev/*.hwdb $(DESTDIR)$(HWDBDIR)
+       udevadm hwdb --root $(DESTDIR) --update