# ------------------------------------------------------------------------------
# libudev
# ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=9
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=9
+LIBUDEV_CURRENT=10
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=10
SUBDIRS += libudev/docs
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
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 = \
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 \
# ------------------------------------------------------------------------------
# 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
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
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 = \
$(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 $@
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
# ------------------------------------------------------------------------------
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 \
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
$(BUILT_SOURCES)
EXTRA_DIST += $(TESTS)
+EXTRA_DIST += test/rule-syntax-check.py
install-exec-hook: $(INSTALL_EXEC_HOOKS)
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/