builtin: kmod - switch to kmod_module_probe_insert_module()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 769a6f5001a192500fe4454592bd97499fb49a27..d95a3619a9b97ca81f232ce12edd5be769556f1c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,9 +40,10 @@ libexec_SCRIPTS =
 dist_libexec_SCRIPTS =
 
 SED_PROCESS = \
-$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
        -e 's,@VERSION\@,$(VERSION),g' \
        -e 's,@prefix\@,$(prefix),g' \
+       -e 's,@rootprefix\@,$(rootprefix),g' \
        -e 's,@exec_prefix\@,$(exec_prefix),g' \
        -e 's,@libdir\@,$(libdir),g' \
        -e 's,@includedir\@,$(includedir),g' \
@@ -56,11 +57,16 @@ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
 %.rules: %.rules.in Makefile
        $(SED_PROCESS)
 
-%.service: %.service.in
+%.service: %.service.in Makefile
        $(SED_PROCESS)
 
-%.sh: %.sh.in
+%.sh: %.sh.in Makefile
        $(SED_PROCESS)
+       $(AM_V_GEN)chmod +x $@
+
+%.pl: %.pl.in Makefile
+       $(SED_PROCESS)
+       $(AM_V_GEN)chmod +x $@
 
 # ------------------------------------------------------------------------------
 # libudev
@@ -145,6 +151,9 @@ dist_udevrules_DATA = \
        rules/rules.d/60-persistent-input.rules \
        rules/rules.d/60-persistent-alsa.rules \
        rules/rules.d/60-persistent-storage.rules \
+       rules/rules.d/75-net-description.rules \
+       rules/rules.d/75-tty-description.rules \
+       rules/rules.d/78-sound-card.rules \
        rules/rules.d/80-drivers.rules \
        rules/rules.d/95-udev-late.rules
 
@@ -203,6 +212,7 @@ udev_common_sources = \
        udev/udev-builtin.c \
        udev/udev-builtin-blkid.c \
        udev/udev-builtin-firmware.c \
+       udev/udev-builtin-hwdb.c \
        udev/udev-builtin-input_id.c \
        udev/udev-builtin-kmod.c \
        udev/udev-builtin-path_id.c \
@@ -219,7 +229,8 @@ udev_common_LDADD = \
 
 udev_common_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+       -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
+       -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
 
 udev_udevd_SOURCES = \
        $(udev_common_sources) \
@@ -271,7 +282,15 @@ udev/%.html : udev/%.xml
 # ------------------------------------------------------------------------------
 # udev tests
 # ------------------------------------------------------------------------------
-TESTS = test/udev-test.pl test/rules-test.sh
+TESTS = \
+       test/udev-test.pl \
+       test/rules-test.sh
+
+EXTRA_DIST += \
+       test/udev-test.pl.in
+
+CLEANFILES += \
+       test/udev-test.pl
 
 check_PROGRAMS = \
        libudev/test-libudev \
@@ -491,25 +510,6 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
 UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
 endif
 
-if ENABLE_HWDB
-# ------------------------------------------------------------------------------
-# usb/pci-db - read vendor/device string database
-# ------------------------------------------------------------------------------
-extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
-extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
-extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/usb-db/usb-db
-dist_udevrules_DATA += \
-       rules/rules.d/75-net-description.rules \
-       rules/rules.d/75-tty-description.rules \
-       rules/rules.d/78-sound-card.rules
-
-extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
-extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
-extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/usb-db/pci-db
-endif
-
 if ENABLE_KEYMAP
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys