chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
make: fix qemu rules file name
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 940cb95e0ae08c75df8c3800d11be73b9d11f62c..0e49b6be298f6b19be4c6a00c803be09f586ee3f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,17 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 CLEANFILES =
 
+INSTALL_EXEC_HOOKS =
+INSTALL_DATA_HOOKS =
+UNINSTALL_EXEC_HOOKS =
+DISTCHECK_HOOKS =
+
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=8
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=8
+LIBUDEV_CURRENT=10
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=10
 
 SUBDIRS += libudev/docs
 
@@ -84,16 +89,18 @@ libudev-install-move-hook:
 libudev-uninstall-move-hook:
        rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
 
-INSTALL_EXEC_HOOKS = libudev-install-move-hook
-UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
+INSTALL_EXEC_HOOKS += libudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
 
 # ------------------------------------------------------------------------------
 # main udev
 # ------------------------------------------------------------------------------
-install-data-local:
+udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
        -mkdir -p $(DESTDIR)$(libexecdir)/devices
 
+INSTALL_DATA_HOOKS += udev-confdirs
+
 EXTRA_DIST += \
        rules/arch \
        rules/misc
@@ -120,6 +127,14 @@ systemdsystemunit_DATA = \
        init/udev.service \
        init/udev-settle.service \
        init/udev-retry.service
+
+systemd-install-hook:
+       mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
+       ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
+       ln -sf ../udev-settle.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-settle.service
+       ln -sf ../udev-retry.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-retry.service
+
+INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
 sbin_PROGRAMS = \
@@ -135,7 +150,9 @@ udev_common_sources =\
 
 udev_udevd_SOURCES = \
        $(udev_common_sources) \
-       udev/udevd.c
+       udev/udevd.c \
+       udev/sd-daemon.h \
+       udev/sd-daemon.c
 udev_udevd_LDADD = libudev/libudev-private.la
 
 udev_udevadm_SOURCES = \
@@ -157,18 +174,26 @@ dist_man_MANS = \
        udev/udevadm.8 \
        udev/udevd.8
 
+dist_noinst_DATA = \
+       udev/udev.html \
+       udev/udevadm.html \
+       udev/udevd.html
+
 EXTRA_DIST += \
        udev/udev.xml \
        udev/udevadm.xml \
        udev/udevd.xml
 
-%.7 %.8 : %.xml
+udev/%.7 udev/%.8 : udev/%.xml
        $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
+udev/%.html : udev/%.xml
+       $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+
 # ------------------------------------------------------------------------------
 # udev tests
 # ------------------------------------------------------------------------------
-TESTS = test/udev-test.pl
+TESTS = test/udev-test.pl test/rules-test.sh
 
 check_PROGRAMS = \
        libudev/test-libudev \
@@ -292,6 +317,11 @@ 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
 
+# ------------------------------------------------------------------------------
+# qemu -- qemu/kvm guest tweaks
+# ------------------------------------------------------------------------------
+dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules
+
 if ENABLE_EXTRAS
 # ------------------------------------------------------------------------------
 # conditional extras (need glib, libusb, libacl, ...)
@@ -304,9 +334,9 @@ dist_udevrules_DATA += \
 # ------------------------------------------------------------------------------
 # GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
-LIBGUDEV_CURRENT=0
-LIBGUDEV_REVISION=1
-LIBGUDEV_AGE=0
+LIBGUDEV_CURRENT=1
+LIBGUDEV_REVISION=0
+LIBGUDEV_AGE=1
 
 SUBDIRS += extras/gudev/docs
 
@@ -317,7 +347,8 @@ libgudev_include_HEADERS = \
        extras/gudev/gudevenumtypes.h \
        extras/gudev/gudevtypes.h \
        extras/gudev/gudevclient.h \
-       extras/gudev/gudevdevice.h
+       extras/gudev/gudevdevice.h \
+       extras/gudev/gudevenumerator.h
 
 lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la
 pkgconfig_DATA += extras/gudev/gudev-1.0.pc
@@ -331,6 +362,8 @@ extras_gudev_libgudev_1_0_la_SOURCES = \
        extras/gudev/gudevclient.c \
        extras/gudev/gudevdevice.h \
        extras/gudev/gudevdevice.c \
+       extras/gudev/gudevenumerator.h \
+       extras/gudev/gudevenumerator.c \
        extras/gudev/gudevprivate.h
 
 dist_extras_gudev_libgudev_1_0_la_SOURCES = \
@@ -401,8 +434,10 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
                $(or $(wildcard $(top_builddir)/extras/gudev/gudevenumtypes.h),$(top_srcdir)/extras/gudev/gudevenumtypes.h) \
                $(top_srcdir)/extras/gudev/gudevclient.h \
                $(top_srcdir)/extras/gudev/gudevdevice.h \
+               $(top_srcdir)/extras/gudev/gudevenumerator.h \
                $(top_srcdir)/extras/gudev/gudevclient.c \
-               $(top_srcdir)/extras/gudev/gudevdevice.c
+               $(top_srcdir)/extras/gudev/gudevdevice.c \
+               $(top_srcdir)/extras/gudev/gudevenumerator.c
 
 extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
        $(AM_V_GEN)g-ir-compiler $< -o $@
@@ -416,6 +451,22 @@ typelibs_DATA = extras/gudev/GUdev-1.0.typelib
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # ENABLE_INTROSPECTION
 
+# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
+libgudev-install-move-hook:
+       if test "$(libdir)" != "$(rootlib_execdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlib_execdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.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)/libgudev-1.0.so && \
+               mv $(DESTDIR)$(libdir)/libgudev-1.0.so.* $(DESTDIR)$(rootlib_execdir); \
+       fi
+
+libgudev-uninstall-move-hook:
+       rm -f $(DESTDIR)$(rootlib_execdir)/libgudev-1.0.so*
+
+INSTALL_EXEC_HOOKS += libgudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
+
 # ------------------------------------------------------------------------------
 # Bluetooth HID devices with special magic to switch the device
 # ------------------------------------------------------------------------------
@@ -537,12 +588,14 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
        extras/keymap/keymaps/lenovo-3000 \
+       extras/keymap/keymaps/lenovo-ideapad \
        extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
        extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
        extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
        extras/keymap/keymaps/lg-x110 \
        extras/keymap/keymaps/logitech-wave \
        extras/keymap/keymaps/logitech-wave-cordless \
+       extras/keymap/keymaps/logitech-wave-pro-cordless \
        extras/keymap/keymaps/maxdata-pro_7000 \
        extras/keymap/keymaps/medion-fid2060 \
        extras/keymap/keymaps/medionnb-a555 \
@@ -552,7 +605,9 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/module-lenovo \
        extras/keymap/keymaps/module-sony \
        extras/keymap/keymaps/module-sony-old \
+       extras/keymap/keymaps/module-sony-vgn \
        extras/keymap/keymaps/olpc-xo \
+       extras/keymap/keymaps/onkyo \
        extras/keymap/keymaps/oqo-model2 \
        extras/keymap/keymaps/samsung-other \
        extras/keymap/keymaps/samsung-sq1us \
@@ -564,6 +619,8 @@ dist_udevkeymap_DATA = \
 
 udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
+       extras/keymap/force-release-maps/dell-touchpad \
+       extras/keymap/force-release-maps/hp-other \
        extras/keymap/force-release-maps/samsung-other \
        extras/keymap/force-release-maps/common-volume-keys
 
@@ -582,7 +639,7 @@ extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
 
 keymaps-distcheck-hook: extras/keymap/keys.txt
        $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS = keymaps-distcheck-hook
+DISTCHECK_HOOKS += keymaps-distcheck-hook
 
 endif # ENABLE_EXTRAS
 
@@ -601,9 +658,12 @@ CLEANFILES += \
        $(BUILT_SOURCES)
 
 EXTRA_DIST += $(TESTS)
+EXTRA_DIST += test/rule-syntax-check.py
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
+install-data-hook: $(INSTALL_DATA_HOOKS)
+
 uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 distcheck-hook: $(DISTCHECK_HOOKS)
@@ -638,5 +698,6 @@ git-release:
        git prune
 
 doc-sync:
+       rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/
        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/
Unnamed repository; edit this file 'description' to name the repository.