X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=601246a9c99e1823adddc5aec08b156f83425c3e;hb=ab17a7ef55b2c3278839302cf3ba5d214d2b2b7d;hp=44cf00218829376202826bf24b154b0d9d841ada;hpb=a04879b5643e9100b3c34c5c4ea9b44c5eec3e92;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 44cf00218..601246a9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,9 @@ DISTCHECK_HOOKS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=9
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=9
+LIBUDEV_CURRENT=10
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=10
 
 SUBDIRS += libudev/docs
 
@@ -129,10 +129,10 @@ systemdsystemunit_DATA = \
 	init/udev-retry.service
 
 systemd-install-hook:
-	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants
-	ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/udev.service
-	ln -sf ../udev-settle.service $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/udev-settle.service
-	ln -sf ../udev-retry.service $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/udev-retry.service
+	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
@@ -150,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 = \
@@ -183,7 +185,7 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 # udev tests
 # ------------------------------------------------------------------------------
-TESTS = test/udev-test.pl
+TESTS = test/udev-test.pl test/rules-test.sh
 
 check_PROGRAMS = \
 	libudev/test-libudev \
@@ -332,7 +334,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
@@ -346,6 +349,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 = \
@@ -416,8 +421,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 $@
@@ -431,6 +438,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
 # ------------------------------------------------------------------------------
@@ -569,6 +592,7 @@ 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 \
@@ -582,6 +606,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
 
@@ -619,6 +645,7 @@ CLEANFILES += \
 	$(BUILT_SOURCES)
 
 EXTRA_DIST += $(TESTS)
+EXTRA_DIST += test/rule-syntax-check.py
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)