chiark / gitweb /
build-sys: use --libexecdir=/usr/lib instead of /usr/lib/udev
[elogind.git] / Makefile.am
index 7a3539507af22037df8503c84dea84fa74df494e..7abad22a61b652fe4018284112881d26f857ca96 100644 (file)
@@ -5,8 +5,6 @@
 
 SUBDIRS = .
 
-EXTRA_DIST = autogen.sh
-
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 AM_MAKEFLAGS = --no-print-directory
@@ -15,9 +13,10 @@ AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -I$(top_srcdir)/libudev \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\"
+       -DPKGLIBEXECDIR=\""$(libexecdir)/udev"\"
 
 AM_CFLAGS = \
+       ${my_CFLAGS} \
        -fvisibility=hidden \
        -ffunction-sections \
        -fdata-sections
@@ -30,13 +29,45 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --enable-gtk-doc \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
-CLEANFILES =
 BUILT_SOURCES =
+EXTRA_DIST =
+CLEANFILES =
 INSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
 UNINSTALL_EXEC_HOOKS =
 DISTCHECK_HOOKS =
-dist_libexec_SCRIPTS =
+pkglibexec_SCRIPTS =
+dist_pkglibexec_SCRIPTS =
+dist_pkglibexec_DATA =
+
+SED_PROCESS = \
+       $(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' \
+       -e 's,@bindir\@,$(bindir),g' \
+       -e 's,@pkglibexecdir\@,$(libexecdir)/udev,g' \
+       < $< > $@ || rm $@
+
+%.pc: %.pc.in Makefile
+       $(SED_PROCESS)
+
+%.rules: %.rules.in Makefile
+       $(SED_PROCESS)
+
+%.service: %.service.in Makefile
+       $(SED_PROCESS)
+
+%.sh: %.sh.in Makefile
+       $(SED_PROCESS)
+       $(AM_V_GEN)chmod +x $@
+
+%.pl: %.pl.in Makefile
+       $(SED_PROCESS)
+       $(AM_V_GEN)chmod +x $@
 
 # ------------------------------------------------------------------------------
 # libudev
@@ -80,6 +111,8 @@ endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libudev/libudev.pc
+EXTRA_DIST += libudev/libudev.pc.in
+CLEANFILES += libudev/libudev.pc
 
 EXTRA_DIST += libudev/COPYING
 # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
@@ -103,7 +136,7 @@ UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
 # ------------------------------------------------------------------------------
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-       -mkdir -p $(DESTDIR)$(libexecdir)/devices
+       -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
 
 INSTALL_DATA_HOOKS += udev-confdirs
 
@@ -111,14 +144,17 @@ EXTRA_DIST += \
        rules/arch \
        rules/misc
 
-udevrulesdir = $(libexecdir)/rules.d
+udevrulesdir = $(libexecdir)/udev/rules.d
 dist_udevrules_DATA = \
        rules/rules.d/50-udev-default.rules \
-       rules/rules.d/60-persistent-storage.rules \
        rules/rules.d/60-persistent-storage-tape.rules \
        rules/rules.d/60-persistent-serial.rules \
        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
 
@@ -127,18 +163,28 @@ dist_udevconf_DATA = udev.conf
 
 sharepkgconfigdir = $(datadir)/pkgconfig
 sharepkgconfig_DATA = udev/udev.pc
+EXTRA_DIST += udev/udev.pc.in
+CLEANFILES += udev/udev.pc
 
 if WITH_SYSTEMD
+dist_systemdsystemunit_DATA = \
+       systemd/udev-control.socket \
+       systemd/udev-kernel.socket
+
 systemdsystemunit_DATA = \
-       init/udev-control.socket \
-       init/udev-kernel.socket \
-       init/udev.service \
-       init/udev-trigger.service \
-       init/udev-settle.service
+       systemd/udev.service \
+       systemd/udev-trigger.service \
+       systemd/udev-settle.service
 
 EXTRA_DIST += \
-       init/udev-control.socket \
-       init/udev-kernel.socket
+       systemd/udev.service.in \
+       systemd/udev-trigger.service.in \
+       systemd/udev-settle.service.in
+
+CLEANFILES += \
+       systemd/udev.service \
+       systemd/udev-trigger.service \
+       systemd/udev-settle.service
 
 systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
@@ -151,13 +197,13 @@ systemd-install-hook:
 INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
-sbin_PROGRAMS = \
+bin_PROGRAMS = \
        udev/udevadm
 
-libexec_PROGRAMS = \
+pkglibexec_PROGRAMS = \
        udev/udevd
 
-udev_common_sources =\
+udev_common_sources = \
        udev/udev.h \
        udev/udev-event.c \
        udev/udev-watch.c \
@@ -165,16 +211,36 @@ udev_common_sources =\
        udev/udev-rules.c \
        udev/udev-ctrl.c \
        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 \
-       udev/udev-builtin-usb_id.c \
-       udev/udev-builtin-input_id.c
+       udev/udev-builtin-usb_id.c
+
+udev_common_CFLAGS = \
+       $(BLKID_CFLAGS) \
+       $(KMOD_CFLAGS)
+
+udev_common_LDADD = \
+       libudev/libudev-private.la \
+       $(BLKID_LIBS) \
+       $(KMOD_LIBS)
+
+udev_common_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \
+       -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\"
 
 udev_udevd_SOURCES = \
        $(udev_common_sources) \
        udev/udevd.c \
        udev/sd-daemon.h \
        udev/sd-daemon.c
-udev_udevd_LDADD = libudev/libudev-private.la
+udev_udevd_CFLAGS = $(udev_common_CFLAGS)
+udev_udevd_LDADD = $(udev_common_LDADD)
+udev_udevd_CPPFLAGS = $(udev_common_CPPFLAGS)
 
 udev_udevadm_SOURCES = \
        $(udev_common_sources) \
@@ -186,7 +252,9 @@ udev_udevadm_SOURCES = \
        udev/udevadm-trigger.c \
        udev/udevadm-test.c \
        udev/udevadm-test-builtin.c
-udev_udevadm_LDADD = libudev/libudev-private.la
+udev_udevadm_CFLAGS = $(udev_common_CFLAGS)
+udev_udevadm_LDADD = $(udev_common_LDADD)
+udev_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 
 # ------------------------------------------------------------------------------
 # udev man pages
@@ -215,7 +283,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 \
@@ -227,30 +303,23 @@ libudev_test_libudev_LDADD = libudev/libudev.la
 udev_test_udev_SOURCES = \
        $(udev_common_sources) \
        udev/test-udev.c
-udev_test_udev_LDADD = libudev/libudev-private.la
-
-# ------------------------------------------------------------------------------
-# firmware - firmware loading
-# ------------------------------------------------------------------------------
-extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
-extras_firmware_firmware_LDADD = libudev/libudev-private.la
-extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
-dist_udevrules_DATA += extras/firmware/50-firmware.rules
-libexec_PROGRAMS += extras/firmware/firmware
+udev_test_udev_CFLAGS = $(udev_common_CFLAGS)
+udev_test_udev_LDADD = $(udev_common_LDADD)
+udev_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS)
 
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
 # ------------------------------------------------------------------------------
 extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c
 extras_ata_id_ata_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/ata_id/ata_id
+pkglibexec_PROGRAMS += extras/ata_id/ata_id
 
 # ------------------------------------------------------------------------------
 # cdrom_id - optical drive/media capability
 # ------------------------------------------------------------------------------
 extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c
 extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/cdrom_id/cdrom_id
+pkglibexec_PROGRAMS += extras/cdrom_id/cdrom_id
 dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
@@ -258,7 +327,7 @@ dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
 # ------------------------------------------------------------------------------
 extras_collect_collect_SOURCES = extras/collect/collect.c
 extras_collect_collect_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/collect/collect
+pkglibexec_PROGRAMS += extras/collect/collect
 
 # ------------------------------------------------------------------------------
 # scsi_id - SCSI inquiry to get various serial numbers
@@ -269,7 +338,7 @@ extras_scsi_id_scsi_id_SOURCES =\
        extras/scsi_id/scsi.h \
        extras/scsi_id/scsi_id.h
 extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/scsi_id/scsi_id
+pkglibexec_PROGRAMS += extras/scsi_id/scsi_id
 dist_man_MANS += extras/scsi_id/scsi_id.8
 EXTRA_DIST += extras/scsi_id/README
 
@@ -278,7 +347,7 @@ EXTRA_DIST += extras/scsi_id/README
 # ------------------------------------------------------------------------------
 extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c
 extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/v4l_id/v4l_id
+pkglibexec_PROGRAMS += extras/v4l_id/v4l_id
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
@@ -286,7 +355,7 @@ dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 # ------------------------------------------------------------------------------
 extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
 extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm
-libexec_PROGRAMS += extras/accelerometer/accelerometer
+pkglibexec_PROGRAMS += extras/accelerometer/accelerometer
 dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
@@ -315,7 +384,10 @@ libgudev_include_HEADERS = \
        extras/gudev/gudevenumerator.h
 
 lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la
+
 pkgconfig_DATA += extras/gudev/gudev-1.0.pc
+EXTRA_DIST += extras/gudev/gudev-1.0.pc.in
+CLEANFILES += extras/gudev/gudev-1.0.pc
 
 extras_gudev_libgudev_1_0_la_SOURCES = \
        extras/gudev/gudevenums.h \
@@ -330,12 +402,12 @@ extras_gudev_libgudev_1_0_la_SOURCES = \
        extras/gudev/gudevenumerator.c \
        extras/gudev/gudevprivate.h
 
-dist_extras_gudev_libgudev_1_0_la_SOURCES = \
+nodist_extras_gudev_libgudev_1_0_la_SOURCES = \
        extras/gudev/gudevmarshal.h \
        extras/gudev/gudevmarshal.c \
        extras/gudev/gudevenumtypes.h \
        extras/gudev/gudevenumtypes.c
-BUILT_SOURCES += $(dist_extras_gudev_libgudev_1_0_la_SOURCES)
+BUILT_SOURCES += $(nodist_extras_gudev_libgudev_1_0_la_SOURCES)
 
 extras_gudev_libgudev_1_0_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
@@ -439,25 +511,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
@@ -469,18 +522,26 @@ nodist_extras_keymap_keymap_SOURCES = \
        extras/keymap/keys-to-name.h
 BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
 
-EXTRA_DIST += extras/keymap/check-keymaps.sh
-dist_udevrules_DATA += extras/keymap/95-keymap.rules
-dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
-libexec_PROGRAMS += extras/keymap/keymap
-dist_libexec_SCRIPTS += extras/keymap/findkeyboards
-dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
+pkglibexec_PROGRAMS += extras/keymap/keymap
 dist_doc_DATA = extras/keymap/README.keymap.txt
+
+dist_udevrules_DATA += \
+       extras/keymap/95-keymap.rules \
+       extras/keymap/95-keyboard-force-release.rules
+
+dist_pkglibexec_SCRIPTS += extras/keymap/findkeyboards
+pkglibexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
+
+EXTRA_DIST += \
+       extras/keymap/check-keymaps.sh \
+       extras/keymap/keyboard-force-release.sh.in
+
 CLEANFILES += \
        extras/keymap/keys.txt \
-       extras/keymap/keys-from-name.gperf
+       extras/keymap/keys-from-name.gperf \
+       extras/keymap/keyboard-force-release.sh
 
-udevkeymapdir = $(libexecdir)/keymaps
+udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
        extras/keymap/keymaps/acer-aspire_5720 \
@@ -539,7 +600,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/toshiba-satellite_m30x \
        extras/keymap/keymaps/zepto-znote
 
-udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
+udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
        extras/keymap/force-release-maps/dell-touchpad \
        extras/keymap/force-release-maps/hp-other \
@@ -574,21 +635,19 @@ extras_mtd_probe_mtd_probe_SOURCES =  \
        extras/mtd_probe/probe_smartmedia.c
 extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
 dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
-libexec_PROGRAMS += extras/mtd_probe/mtd_probe
+pkglibexec_PROGRAMS += extras/mtd_probe/mtd_probe
 endif
 
 if ENABLE_RULE_GENERATOR
 # ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
-dist_libexec_SCRIPTS += \
+dist_pkglibexec_SCRIPTS += \
        extras/rule_generator/write_cd_rules \
        extras/rule_generator/write_net_rules
 
-udevhomedir = $(libexecdir)
-dist_udevhome_DATA = extras/rule_generator/rule_generator.functions
-
-dist_udevrules_DATA += \
+pkglibexec_DATA = extras/rule_generator/rule_generator.functions
+dist_pkglibexec_DATA += \
        extras/rule_generator/75-cd-aliases-generator.rules \
        extras/rule_generator/75-persistent-net-generator.rules
 endif
@@ -601,11 +660,11 @@ extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c
 extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
 dist_udevrules_DATA += extras/udev-acl/70-udev-acl.rules
-libexec_PROGRAMS += extras/udev-acl/udev-acl
+pkglibexec_PROGRAMS += extras/udev-acl/udev-acl
 
 udevacl-install-hook:
        mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
-       ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
+       ln -sf $(libexecdir)/udev/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 INSTALL_EXEC_HOOKS += udevacl-install-hook
 endif
@@ -616,7 +675,7 @@ if ENABLE_FLOPPY
 # ------------------------------------------------------------------------------
 extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c
 extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/floppy/create_floppy_devices
+pkglibexec_PROGRAMS += extras/floppy/create_floppy_devices
 dist_udevrules_DATA += extras/floppy/60-floppy.rules
 endif
 
@@ -626,7 +685,7 @@ if ENABLE_EDD
 # ------------------------------------------------------------------------------
 extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c
 extras_edd_id_edd_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/edd_id/edd_id
+pkglibexec_PROGRAMS += extras/edd_id/edd_id
 dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 endif
 
@@ -639,14 +698,13 @@ clean-local:
 distclean-local:
        rm -rf autom4te.cache
 
+EXTRA_DIST += \
+       $(TESTS) \
+       test/rule-syntax-check.py
+
 CLEANFILES += \
-       udev-$(VERSION).tar.gz \
-       udev-$(VERSION).tar.bz2 \
        $(BUILT_SOURCES)
 
-EXTRA_DIST += $(TESTS)
-EXTRA_DIST += test/rule-syntax-check.py
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 install-data-hook: $(INSTALL_DATA_HOOKS)
@@ -685,15 +743,14 @@ git-release:
 
 tar:
        make distcheck
-       gpg --armor --detach-sign udev-$(VERSION).tar.gz
-       gpg --armor --detach-sign udev-$(VERSION).tar.bz2
+       gpg --armor --detach-sign udev-$(VERSION).tar.xz
 
 git-sync:
        git push
        git push --tags $(VERSION)
 
 tar-sync:
-       scp udev-$(VERSION).tar.gz master.kernel.org:/pub/linux/utils/kernel/hotplug/
+       scp udev-$(VERSION).tar.xz master.kernel.org:/pub/linux/utils/kernel/hotplug/
 
 doc-sync:
        rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/