chiark / gitweb /
make: sort Makefile.am per target/extra
authorKay Sievers <kay.sievers@vrfy.org>
Fri, 14 Aug 2009 17:27:00 +0000 (19:27 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Fri, 14 Aug 2009 17:27:00 +0000 (19:27 +0200)
Makefile.am

index bc18fd1..604a33b 100644 (file)
@@ -1,21 +1,11 @@
-SUBDIRS = . libudev/docs
-
-udevconfdir = $(sysconfdir)/udev
-dist_udevconf_DATA = \
-       udev.conf
-
-EXTRA_DIST = \
-       autogen.sh \
-       libudev/exported_symbols \
-       extras/keymap/check-keymaps.sh \
-       extras/gudev/gudevmarshal.list \
-       extras/gudev/gudevenumtypes.h.template \
-       extras/gudev/gudevenumtypes.c.template
+# ------------------------------------------------------------------------------
+# Copyright (C) 2008-2009 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2009 Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
+# ------------------------------------------------------------------------------
 
-CLEANFILES = \
-       udev-$(VERSION).tar.gz udev-$(VERSION).tar.bz2
+SUBDIRS = .
 
-BUILT_SOURCES =
+EXTRA_DIST = autogen.sh
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -27,66 +17,25 @@ AM_CPPFLAGS = \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DLIBEXECDIR=\""$(libexecdir)"\"
 
-AM_CFLAGS =
-
 AM_LDFLAGS = \
        -Wl,--as-needed
 
-udevrulesdir = \
-       $(libexecdir)/rules.d
-
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-gtk-doc \
        --enable-extras
 
-install-data-local:
-       -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-
-clean-local:
-       rm -rf udev-test-install
-
-distclean-local:
-       rm -rf autom4te.cache
-
-PREVIOUS_VERSION = `expr $(VERSION) - 1`
-
-changelog:
-       @ head -1 ChangeLog | grep -q "to v$(PREVIOUS_VERSION)"
-       @ mv ChangeLog ChangeLog.tmp
-       @ echo "Summary of changes from v$(PREVIOUS_VERSION) to v$(VERSION)" >> ChangeLog
-       @ echo "============================================" >> ChangeLog
-       @ echo >> ChangeLog
-       @ git log --pretty=short $(PREVIOUS_VERSION)..HEAD | git shortlog  >> ChangeLog
-       @ echo >> ChangeLog
-       @ cat ChangeLog
-       @ cat ChangeLog.tmp >> ChangeLog
-       @ rm ChangeLog.tmp
-
-test-install:
-       rm -rf $(PWD)/udev-test-install/
-       make DESTDIR=$(PWD)/udev-test-install install
-       tree $(PWD)/udev-test-install/
-
-git-release:
-       head -1 ChangeLog | grep -q "to v$(VERSION)"
-       head -1 NEWS | grep -q "udev $(VERSION)"
-       git commit -a -m "release $(VERSION)"
-       cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
-       git gc
-       git prune
+CLEANFILES =
 
-doc-sync:
-       rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/
-       rsync -av --delete extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/
+# ------------------------------------------------------------------------------
+# libudev
+# ------------------------------------------------------------------------------
+LIBUDEV_CURRENT=5
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=5
 
-INSTALL_EXEC_HOOKS = libudev-install-move-hook
-UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
+SUBDIRS += libudev/docs
 
 include_HEADERS = libudev/libudev.h
-
-# ------------------------------------------------------------------------------
-# Libraries
-# ------------------------------------------------------------------------------
 lib_LTLIBRARIES = libudev/libudev.la
 
 libudev_libudev_la_SOURCES =\
@@ -99,9 +48,6 @@ libudev_libudev_la_SOURCES =\
        libudev/libudev-monitor.c \
        libudev/libudev-queue.c
 
-LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
-LIBUDEV_AGE=5
 libudev_libudev_la_LDFLAGS = \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
        -export-symbols $(top_srcdir)/libudev/exported_symbols
@@ -116,53 +62,59 @@ libudev_libudev_private_la_SOURCES =\
        libudev/libudev-device-private.c \
        libudev/libudev-queue-private.c
 
-libudev_libudev_private_la_LIBADD =
+if WITH_SELINUX
+libudev_libudev_private_la_SOURCES += libudev/libudev-selinux-private.c
+libudev_libudev_private_la_LIBADD = $(SELINUX_LIBS)
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libudev/libudev.pc
 
-extras_gudev_libgudev_1_0_la_SOURCES = \
-       extras/gudev/gudevenums.h \
-       extras/gudev/gudevenumtypes.h \
-       extras/gudev/gudevenumtypes.h\
-       extras/gudev/gudevtypes.h \
-       extras/gudev/gudevclient.h \
-       extras/gudev/gudevclient.c \
-       extras/gudev/gudevdevice.h \
-       extras/gudev/gudevdevice.c \
-       extras/gudev/gudevprivate.h
-
-dist_extras_gudev_libgudev_1_0_la_SOURCES = \
-       extras/gudev/gudevmarshal.h \
-       extras/gudev/gudevmarshal.c \
-       extras/gudev/gudevenumtypes.h \
-       extras/gudev/gudevenumtypes.c
-
-extras_gudev_libgudev_1_0_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_builddir)/extras \
-       -I$(top_srcdir)/extras \
-       -I$(top_builddir)/extras/gudev \
-       -I$(top_srcdir)/extras/gudev \
-       -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-       -D_GUDEV_COMPILATION \
-       -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
-       -DG_LOG_DOMAIN=\"GUdev\"
-extras_gudev_libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS)
-extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS)
+EXTRA_DIST += libudev/exported_symbols
+# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
+libudev-install-move-hook:
+       if test "$(libdir)" != "$(rootlib_execdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlib_execdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
+               mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \
+       fi
 
-LIBGUDEV_CURRENT=0
-LIBGUDEV_REVISION=1
-LIBGUDEV_AGE=0
+libudev-uninstall-move-hook:
+       rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
 
-extras_gudev_libgudev_1_0_la_LDFLAGS = \
-       -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
-       -export-dynamic -no-undefined \
-       -export-symbols-regex '^g_udev_.*'
+INSTALL_EXEC_HOOKS = libudev-install-move-hook
+UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
 
 # ------------------------------------------------------------------------------
-# Programs
+# main udev
 # ------------------------------------------------------------------------------
+install-data-local:
+       -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+
+EXTRA_DIST += \
+       rules/packages \
+       rules/redhat \
+       rules/suse \
+       rules/gentoo
+
+udevrulesdir = $(libexecdir)/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/80-drivers.rules \
+       rules/rules.d/95-udev-late.rules
+
+udevconfdir = $(sysconfdir)/udev
+dist_udevconf_DATA = udev.conf
+
+sharepkgconfigdir = $(datadir)/pkgconfig
+sharepkgconfig_DATA = udev/udev.pc
 
 sbin_PROGRAMS = \
        udev/udevd \
@@ -174,13 +126,11 @@ udev_common_sources =\
        udev/udev-watch.c \
        udev/udev-node.c \
        udev/udev-rules.c
-udev_common_libs = libudev/libudev-private.la
 
 udev_udevd_SOURCES = \
        $(udev_common_sources) \
        udev/udevd.c
-
-udev_udevd_LDADD = $(udev_common_libs)
+udev_udevd_LDADD = libudev/libudev-private.la
 
 udev_udevadm_SOURCES = \
        $(udev_common_sources) \
@@ -191,51 +141,120 @@ udev_udevadm_SOURCES = \
        udev/udevadm-monitor.c \
        udev/udevadm-settle.c \
        udev/udevadm-trigger.c
+udev_udevadm_LDADD = libudev/libudev-private.la
+
+# ------------------------------------------------------------------------------
+# udev docs and man pages
+# ------------------------------------------------------------------------------
+writing_udev_rulesdir = $(docdir)/writing_udev_rules
+dist_writing_udev_rules_DATA = \
+       docs/writing_udev_rules/index.html
+
+dist_man_MANS = \
+       udev/udev.7 \
+       udev/udevadm.8 \
+       udev/udevd.8
+
+EXTRA_DIST += \
+       udev/udev.xml \
+       udev/udevadm.xml \
+       udev/udevd.xml
+
+%.7 %.8 : %.xml
+       $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+# ------------------------------------------------------------------------------
+# udev tests
+# ------------------------------------------------------------------------------
+TESTS = test/udev-test.pl
+
+check_PROGRAMS = \
+       libudev/test-libudev \
+       udev/test-udev
+
+libudev_test_libudev_SOURCES = libudev/test-libudev.c
+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
 
-udev_udevadm_LDADD = $(udev_common_libs)
-
-libexec_PROGRAMS = \
-       extras/ata_id/ata_id \
-       extras/cdrom_id/cdrom_id \
-       extras/collect/collect \
-       extras/edd_id/edd_id \
-       extras/floppy/create_floppy_devices \
-       extras/path_id/path_id \
-       extras/fstab_import/fstab_import \
-       extras/scsi_id/scsi_id \
-       extras/usb_id/usb_id \
-       extras/v4l_id/v4l_id
-
-dist_libexec_SCRIPTS = \
-       extras/firmware/firmware.sh \
+# ------------------------------------------------------------------------------
+# firmware.sh - firmware loading
+# ------------------------------------------------------------------------------
+dist_libexec_SCRIPTS = extras/firmware/firmware.sh
+dist_udevrules_DATA += extras/firmware/50-firmware.rules
+
+# ------------------------------------------------------------------------------
+# rule_generator - persistent network and optical device rule generator
+# ------------------------------------------------------------------------------
+dist_libexec_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_udevhome_DATA = extras/rule_generator/rule_generator.functions
+
+dist_udevrules_DATA += \
+       extras/rule_generator/75-cd-aliases-generator.rules \
+       extras/rule_generator/75-persistent-net-generator.rules
 
+# ------------------------------------------------------------------------------
+# 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
 
+# ------------------------------------------------------------------------------
+# 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
+dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
 
+# ------------------------------------------------------------------------------
+# collect - trigger action when a collection of devices appeared
+# ------------------------------------------------------------------------------
 extras_collect_collect_SOURCES = extras/collect/collect.c
 extras_collect_collect_LDADD = libudev/libudev-private.la
+libexec_PROGRAMS += extras/collect/collect
 
+# ------------------------------------------------------------------------------
+# edd_id - BIOS EDD block device match
+# ------------------------------------------------------------------------------
 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
+dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 
+# ------------------------------------------------------------------------------
+# create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
+# ------------------------------------------------------------------------------
 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
 
+# ------------------------------------------------------------------------------
+# path_id - compose identifier of persistent elements of the parent buses
+# ------------------------------------------------------------------------------
 extras_path_id_path_id_SOURCES = extras/path_id/path_id.c
 extras_path_id_path_id_LDADD = libudev/libudev-private.la
+libexec_PROGRAMS += extras/path_id/path_id
 
+# ------------------------------------------------------------------------------
+# fstab_import - import /etc/fstab entry for block device
+# ------------------------------------------------------------------------------
 extras_fstab_import_fstab_import_SOURCES = extras/fstab_import/fstab_import.c
 extras_fstab_import_fstab_import_LDADD = libudev/libudev-private.la
+libexec_PROGRAMS += extras/fstab_import/fstab_import
+dist_udevrules_DATA += extras/fstab_import/79-fstab_import.rules
 
+# ------------------------------------------------------------------------------
+# scsi_id - SCSI inquiry to get various serial numbers
+# ------------------------------------------------------------------------------
 extras_scsi_id_scsi_id_SOURCES =\
        extras/scsi_id/scsi_id.c \
        extras/scsi_id/scsi_serial.c \
@@ -243,161 +262,227 @@ extras_scsi_id_scsi_id_SOURCES =\
        extras/scsi_id/scsi_id.h \
        extras/scsi_id/bsg.h
 extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
+libexec_PROGRAMS += extras/scsi_id/scsi_id
+dist_man_MANS += extras/scsi_id/scsi_id.8
 
+# ------------------------------------------------------------------------------
+# usb_id - USB device property import
+# ------------------------------------------------------------------------------
 extras_usb_id_usb_id_SOURCES = extras/usb_id/usb_id.c
 extras_usb_id_usb_id_LDADD = libudev/libudev-private.la
+libexec_PROGRAMS += extras/usb_id/usb_id
 
+# ------------------------------------------------------------------------------
+# v4l_id - video4linux capabilities
+# ------------------------------------------------------------------------------
 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
+dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
-extras_hid2hci_hid2hci_SOURCES = extras/hid2hci/hid2hci.c
-extras_hid2hci_hid2hci_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
-extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
-
-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)
-
-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
-
-extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
-extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_PCI
-extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
-
-extras_modem_modeswitch_modem_modeswitch_SOURCES =\
-       extras/modem-modeswitch/modem-modeswitch.c \
-       extras/modem-modeswitch/utils.c \
-       extras/modem-modeswitch/utils.h \
-       extras/modem-modeswitch/ma8280p_us.c \
-       extras/modem-modeswitch/ma8280p_us.h \
-       extras/modem-modeswitch/option.c \
-       extras/modem-modeswitch/option.h
-extras_modem_modeswitch_modem_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
-extras_modem_modeswitch_modem_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
-
-extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
-extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap
-nodist_extras_keymap_keymap_SOURCES = \
-       extras/keymap/keys-from-name.h \
-       extras/keymap/keys-to-name.h
+# ------------------------------------------------------------------------------
+# conditional extras (need glib, libusb, libacl, ...)
+# ------------------------------------------------------------------------------
+if ENABLE_EXTRAS
+dist_udevrules_DATA += \
+       rules/rules.d/75-net-description.rules \
+       rules/rules.d/75-tty-description.rules \
+       rules/rules.d/78-sound-card.rules
 
 # ------------------------------------------------------------------------------
-# Tests
+# GUdev
 # ------------------------------------------------------------------------------
+LIBGUDEV_CURRENT=0
+LIBGUDEV_REVISION=1
+LIBGUDEV_AGE=0
 
-TESTS = test/udev-test.pl
+SUBDIRS += extras/gudev/docs
 
-check_PROGRAMS = \
-       libudev/test-libudev \
-       udev/test-udev
+libgudev_includedir=$(includedir)/gudev-1.0/gudev
+libgudev_include_HEADERS = \
+       extras/gudev/gudev.h \
+       extras/gudev/gudevenums.h \
+       extras/gudev/gudevenumtypes.h \
+       extras/gudev/gudevtypes.h \
+       extras/gudev/gudevclient.h \
+       extras/gudev/gudevdevice.h
 
-libudev_test_libudev_SOURCES = libudev/test-libudev.c
-libudev_test_libudev_LDADD = libudev/libudev.la
+lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la
+pkgconfig_DATA += extras/gudev/gudev-1.0.pc
 
-udev_test_udev_SOURCES = \
-       $(udev_common_sources) \
-       udev/test-udev.c
-udev_test_udev_LDADD = $(udev_common_libs)
+extras_gudev_libgudev_1_0_la_SOURCES = \
+       extras/gudev/gudevenums.h \
+       extras/gudev/gudevenumtypes.h \
+       extras/gudev/gudevenumtypes.h\
+       extras/gudev/gudevtypes.h \
+       extras/gudev/gudevclient.h \
+       extras/gudev/gudevclient.c \
+       extras/gudev/gudevdevice.h \
+       extras/gudev/gudevdevice.c \
+       extras/gudev/gudevprivate.h
 
-# ------------------------------------------------------------------------------
-# Basic rules
-# ------------------------------------------------------------------------------
+dist_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)
 
-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/80-drivers.rules \
-       rules/rules.d/95-udev-late.rules \
-       extras/rule_generator/75-cd-aliases-generator.rules \
-       extras/rule_generator/75-persistent-net-generator.rules \
-       extras/cdrom_id/60-cdrom_id.rules \
-       extras/edd_id/61-persistent-storage-edd.rules \
-       extras/firmware/50-firmware.rules \
-       extras/fstab_import/79-fstab_import.rules \
-       extras/v4l_id/60-persistent-v4l.rules
+extras_gudev_libgudev_1_0_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_builddir)/extras \
+       -I$(top_srcdir)/extras \
+       -I$(top_builddir)/extras/gudev \
+       -I$(top_srcdir)/extras/gudev \
+       -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
+       -D_GUDEV_COMPILATION \
+       -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+       -DG_LOG_DOMAIN=\"GUdev\"
+extras_gudev_libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS)
+extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS)
+
+extras_gudev_libgudev_1_0_la_LDFLAGS = \
+       -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
+       -export-dynamic -no-undefined \
+       -export-symbols-regex '^g_udev_.*'
 
 EXTRA_DIST += \
-       rules/packages \
-       rules/redhat \
-       rules/suse \
-       rules/gentoo
+       extras/gudev/gudevmarshal.list \
+       extras/gudev/gudevenumtypes.h.template \
+       extras/gudev/gudevenumtypes.c.template
 
-# ------------------------------------------------------------------------------
-# Pkg-config, docs and man pages
-# ------------------------------------------------------------------------------
-sharepkgconfigdir = $(datadir)/pkgconfig
-sharepkgconfig_DATA = udev/udev.pc
+extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list
+       $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
-writing_udev_rulesdir = $(docdir)/writing_udev_rules
-dist_writing_udev_rules_DATA = \
-       docs/writing_udev_rules/index.html
+extras/gudev/gudevmarshal.c: extras/gudev/gudevmarshal.list
+       $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
+       glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
-dist_man_MANS = \
-       udev/udev.7 \
-       udev/udevadm.8 \
-       udev/udevd.8 \
-       extras/scsi_id/scsi_id.8
+extras/gudev/gudevenumtypes.h: extras/gudev/gudevenumtypes.h.template extras/gudev/gudevenums.h
+       $(AM_V_GEN)glib-mkenums --template $^ > \
+           $@.tmp && mv $@.tmp $@
 
-EXTRA_DIST += \
-       udev/udev.xml \
-       udev/udevadm.xml \
-       udev/udevd.xml
+extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gudev/gudevenums.h
+       $(AM_V_GEN)glib-mkenums --template $^ > \
+           $@.tmp && mv $@.tmp $@
 
-%.7 %.8 : %.xml
-       $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
+       $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+       $(G_IR_SCANNER) -v \
+               --namespace GUdev \
+               --nsversion=1.0 \
+               --include=GObject-2.0 \
+               --library=gudev-1.0 \
+               --library-path=extras/gudev \
+               --output $@ \
+               --pkg=glib-2.0 \
+               --pkg=gobject-2.0 \
+               -I$(top_srcdir)/extras \
+               -D_GUDEV_COMPILATION \
+               -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+               $(top_srcdir)/extras/gudev/gudev.h \
+               $(top_srcdir)/extras/gudev/gudevtypes.h \
+               $(top_srcdir)/extras/gudev/gudevenums.h \
+               $(top_srcdir)/extras/gudev/gudevenumtypes.h \
+               $(top_srcdir)/extras/gudev/gudevclient.h \
+               $(top_srcdir)/extras/gudev/gudevdevice.h \
+               $(top_srcdir)/extras/gudev/gudevclient.c \
+               $(top_srcdir)/extras/gudev/gudevdevice.c
+
+extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
+       $(AM_V_GEN)g-ir-compiler $< -o $@
+
+if ENABLE_INTROSPECTION
+girdir = $(GIRDIR)
+gir_DATA = extras/gudev/GUdev-1.0.gir
+
+typelibsdir = $(GIRTYPELIBDIR)
+typelibs_DATA = extras/gudev/GUdev-1.0.typelib
+
+EXTRA_DIST += GUdev-1.0.gir
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+endif # ENABLE_INTROSPECTION
 
 # ------------------------------------------------------------------------------
-# Conditionals (SElinux, etc…)
+# Bluetooth HID devices with special magic to switch the device
 # ------------------------------------------------------------------------------
-if WITH_SELINUX
-libudev_libudev_private_la_SOURCES += \
-       libudev/libudev-selinux-private.c
-libudev_libudev_private_la_LIBADD += \
-       $(SELINUX_LIBS)
-endif
+extras_hid2hci_hid2hci_SOURCES = extras/hid2hci/hid2hci.c
+extras_hid2hci_hid2hci_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
+extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
+dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
+libexec_PROGRAMS += extras/hid2hci/hid2hci
+
+# ------------------------------------------------------------------------------
+# udev_acl - apply ACLs for users with local forground sessions
+# ------------------------------------------------------------------------------
+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-acl.rules
+libexec_PROGRAMS += extras/udev-acl/udev-acl
+
+udevacl-install-hook:
+       mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
+       ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
 
-if ENABLE_EXTRAS
 INSTALL_EXEC_HOOKS += udevacl-install-hook
 
-lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la
+# ------------------------------------------------------------------------------
+# usb-db - read USB 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
+
+# ------------------------------------------------------------------------------
+# pci-db - read PCI vendor/device string database
+# ------------------------------------------------------------------------------
+extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
+extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_PCI
+extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
+libexec_PROGRAMS += extras/usb-db/pci-db
+
+# ------------------------------------------------------------------------------
+# modem-modeswitch - magic config switch for 3G modems
+# ------------------------------------------------------------------------------
+extras_modem_modeswitch_modem_modeswitch_SOURCES =\
+       extras/modem-modeswitch/modem-modeswitch.c \
+       extras/modem-modeswitch/utils.c \
+       extras/modem-modeswitch/utils.h \
+       extras/modem-modeswitch/ma8280p_us.c \
+       extras/modem-modeswitch/ma8280p_us.h \
+       extras/modem-modeswitch/option.c \
+       extras/modem-modeswitch/option.h
+extras_modem_modeswitch_modem_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
+extras_modem_modeswitch_modem_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
 
 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/hid2hci/70-hid2hci.rules \
        extras/modem-modeswitch/61-option-modem-modeswitch.rules \
-       extras/modem-modeswitch/61-mobile-action.rules \
-       extras/keymap/95-keymap.rules \
-       extras/udev-acl/70-acl.rules
-
-libexec_PROGRAMS += \
-       extras/hid2hci/hid2hci \
-       extras/udev-acl/udev-acl \
-       extras/usb-db/usb-db \
-       extras/usb-db/pci-db \
-       extras/modem-modeswitch/modem-modeswitch \
-       extras/keymap/keymap
+       extras/modem-modeswitch/61-mobile-action.rules
 
-dist_libexec_SCRIPTS += \
-       extras/keymap/findkeyboards
+libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
 
-BUILT_SOURCES += \
-       $(nodist_extras_keymap_keymap_SOURCES) \
-       $(dist_extras_gudev_libgudev_1_0_la_SOURCES)
+# ------------------------------------------------------------------------------
+# keymap - map custom hardware's multimedia keys
+# ------------------------------------------------------------------------------
+extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
+extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap
+nodist_extras_keymap_keymap_SOURCES = \
+       extras/keymap/keys-from-name.h \
+       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
+libexec_PROGRAMS += extras/keymap/keymap
+dist_libexec_SCRIPTS += extras/keymap/findkeyboards
+dist_doc_DATA = extras/keymap/README.keymap.txt
 
 CLEANFILES += \
        extras/keymap/keys.txt \
        extras/keymap/keys-from-name.gperf
 
-dist_doc_DATA = extras/keymap/README.keymap.txt
-
 udevkeymapdir = $(libexecdir)/keymaps
 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
@@ -441,117 +526,75 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/toshiba-satellite_a110 \
        extras/keymap/keymaps/zepto-znote
 
-libgudev_includedir=$(includedir)/gudev-1.0/gudev
-libgudev_include_HEADERS = \
-       extras/gudev/gudev.h \
-       extras/gudev/gudevenums.h \
-       extras/gudev/gudevenumtypes.h \
-       extras/gudev/gudevtypes.h \
-       extras/gudev/gudevclient.h \
-       extras/gudev/gudevdevice.h
-
-pkgconfig_DATA += extras/gudev/gudev-1.0.pc
-
-SUBDIRS += extras/gudev/docs
-endif
+extras/keymap/keys.txt: /usr/include/linux/input.h
+       $(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@
 
-if ENABLE_INTROSPECTION
-girdir = $(GIRDIR)
-gir_DATA = extras/gudev/GUdev-1.0.gir
+extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
-typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = extras/gudev/GUdev-1.0.typelib
+extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
+       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
 
-EXTRA_DIST += GUdev-1.0.gir
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif # ENABLE_INTROSPECTION
+extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
 
-CLEANFILES += $(BUILT_SOURCES)
+keymaps-distcheck-hook: extras/keymap/keys.txt
+       $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
+DISTCHECK_HOOKS = keymaps-distcheck-hook
 
-EXTRA_DIST += $(TESTS)
+endif # ENABLE_EXTRAS
 
 # ------------------------------------------------------------------------------
-# Install and uninstall hooks
+# install, uninstall, clean hooks
 # ------------------------------------------------------------------------------
-install-exec-hook: $(INSTALL_EXEC_HOOKS)
+clean-local:
+       rm -rf udev-test-install
 
-uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
+distclean-local:
+       rm -rf autom4te.cache
 
-distcheck-hook: keymaps-distcheck-hook
+CLEANFILES += \
+       udev-$(VERSION).tar.gz \
+       udev-$(VERSION).tar.bz2 \
+       $(BUILT_SOURCES)
 
-# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
-libudev-install-move-hook:
-       if test "$(libdir)" != "$(rootlib_execdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlib_execdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
-               mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \
-       fi
+EXTRA_DIST += $(TESTS)
 
-libudev-uninstall-move-hook:
-       rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
+install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-udevacl-install-hook:
-       mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
-       ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
+uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
-keymaps-distcheck-hook: extras/keymap/keys.txt
-       $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
+distcheck-hook: $(DISTCHECK_HOOKS)
 
 # ------------------------------------------------------------------------------
-# Custom rules
+# custom release helpers
 # ------------------------------------------------------------------------------
+PREVIOUS_VERSION = `expr $(VERSION) - 1`
+changelog:
+       @ head -1 ChangeLog | grep -q "to v$(PREVIOUS_VERSION)"
+       @ mv ChangeLog ChangeLog.tmp
+       @ echo "Summary of changes from v$(PREVIOUS_VERSION) to v$(VERSION)" >> ChangeLog
+       @ echo "============================================" >> ChangeLog
+       @ echo >> ChangeLog
+       @ git log --pretty=short $(PREVIOUS_VERSION)..HEAD | git shortlog  >> ChangeLog
+       @ echo >> ChangeLog
+       @ cat ChangeLog
+       @ cat ChangeLog.tmp >> ChangeLog
+       @ rm ChangeLog.tmp
 
-extras/keymap/keys.txt: /usr/include/linux/input.h
-       $(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@
-
-extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
-
-extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
-       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
-
-extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
-extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list
-       $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
-
-extras/gudev/gudevmarshal.c: extras/gudev/gudevmarshal.list
-       $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
-       glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
-
-extras/gudev/gudevenumtypes.h: extras/gudev/gudevenumtypes.h.template extras/gudev/gudevenums.h
-       $(AM_V_GEN)glib-mkenums --template $^ > \
-           $@.tmp && mv $@.tmp $@
-
-extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gudev/gudevenums.h
-       $(AM_V_GEN)glib-mkenums --template $^ > \
-           $@.tmp && mv $@.tmp $@
+test-install:
+       rm -rf $(PWD)/udev-test-install/
+       make DESTDIR=$(PWD)/udev-test-install install
+       tree $(PWD)/udev-test-install/
 
-extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
-       $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
-       $(G_IR_SCANNER) -v \
-               --namespace GUdev \
-               --nsversion=1.0 \
-               --include=GObject-2.0 \
-               --library=gudev-1.0 \
-               --library-path=extras/gudev \
-               --output $@ \
-               --pkg=glib-2.0 \
-               --pkg=gobject-2.0 \
-               -I$(top_srcdir)/extras \
-               -D_GUDEV_COMPILATION \
-               -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
-               $(top_srcdir)/extras/gudev/gudev.h \
-               $(top_srcdir)/extras/gudev/gudevtypes.h \
-               $(top_srcdir)/extras/gudev/gudevenums.h \
-               $(top_srcdir)/extras/gudev/gudevenumtypes.h \
-               $(top_srcdir)/extras/gudev/gudevclient.h \
-               $(top_srcdir)/extras/gudev/gudevdevice.h \
-               $(top_srcdir)/extras/gudev/gudevclient.c \
-               $(top_srcdir)/extras/gudev/gudevdevice.c
+git-release:
+       head -1 ChangeLog | grep -q "to v$(VERSION)"
+       head -1 NEWS | grep -q "udev $(VERSION)"
+       git commit -a -m "release $(VERSION)"
+       cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
+       git gc
+       git prune
 
-extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
-       $(AM_V_GEN)g-ir-compiler $< -o $@
+doc-sync:
+       rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/
+       rsync -av --delete extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/