libudev: enumerate - scan /sys/module

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 998a385944f7ce33e17307b1d00d7bbbbd53d7e7..0ca351c82d8d81d7f654c3dc30ac3b0150e0529b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ dist_libexec_SCRIPTS =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=11
-LIBUDEV_REVISION=5
+LIBUDEV_REVISION=6
 LIBUDEV_AGE=11
 
 SUBDIRS += libudev/docs
@@ -304,6 +304,14 @@ 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
 
+# ------------------------------------------------------------------------------
+# accelerometer - updates device orientation
+# ------------------------------------------------------------------------------
+extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
+extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm
+libexec_PROGRAMS += extras/accelerometer/accelerometer
+dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules
+
 # ------------------------------------------------------------------------------
 # qemu -- qemu/kvm guest tweaks
 # ------------------------------------------------------------------------------
@@ -628,23 +636,6 @@ libexec_PROGRAMS += extras/edd_id/edd_id
 dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 endif
 
-if ENABLE_ACTION_MODESWITCH
-# ------------------------------------------------------------------------------
-# mobile-action-modeswitch - switch Mobile Action cables into serial mode
-# ------------------------------------------------------------------------------
-extras_mobile_action_modeswitch_mobile_action_modeswitch_SOURCES =\
-       extras/mobile-action-modeswitch/mobile-action-modeswitch.c \
-       extras/mobile-action-modeswitch/utils.c \
-       extras/mobile-action-modeswitch/utils.h \
-       extras/mobile-action-modeswitch/ma8280p_us.c \
-       extras/mobile-action-modeswitch/ma8280p_us.h
-extras_mobile_action_modeswitch_mobile_action_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
-extras_mobile_action_modeswitch_mobile_action_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
-dist_udevrules_DATA += \
-       extras/mobile-action-modeswitch/61-mobile-action.rules
-libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
-endif
-
 # ------------------------------------------------------------------------------
 # install, uninstall, clean hooks
 # ------------------------------------------------------------------------------
@@ -695,9 +686,12 @@ 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
+       git tag $(VERSION)
+       git gc --prune=0
+
+git-sync:
+       git push
+       git push --tags $(VERSION)
 
 tar-sync:
        scp udev-$(VERSION).gz master.kernel.org:/pub/linux/utils/kernel/hotplug/