X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0b670d53404d4b422ad25bfdb81409453390f626;hp=1537d56ebe3bbd2686710098c2781e1a65d757f0;hb=39b3b6ea8529a1302f23c24e67246b0e587ba993;hpb=666fcf03bceea8e8dd6c4510220036d1b949b814

diff --git a/Makefile.am b/Makefile.am
index 1537d56eb..0b670d534 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,9 @@ dist_libexec_SCRIPTS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=11
-LIBUDEV_REVISION=5
-LIBUDEV_AGE=11
+LIBUDEV_CURRENT=12
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=12
 
 SUBDIRS += libudev/docs
 
@@ -68,7 +68,6 @@ noinst_LTLIBRARIES = \
 
 libudev_libudev_private_la_SOURCES =\
 	$(libudev_libudev_la_SOURCES) \
-	libudev/libudev-ctrl.c \
 	libudev/libudev-util-private.c \
 	libudev/libudev-device-private.c \
 	libudev/libudev-queue-private.c
@@ -130,16 +129,20 @@ sharepkgconfig_DATA = udev/udev.pc
 
 if WITH_SYSTEMD
 systemdsystemunit_DATA = \
-	init/udev.socket \
+	init/udev-control.socket \
+	init/udev-kernel.socket \
 	init/udev.service \
 	init/udev-trigger.service \
 	init/udev-settle.service
 
-EXTRA_DIST += init/udev.socket
+EXTRA_DIST += \
+	init/udev-control.socket \
+	init/udev-kernel.socket
 
 systemd-install-hook:
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
-	ln -sf ../udev.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev.socket
+	ln -sf ../udev-control.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-control.socket
+	ln -sf ../udev-kernel.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-kernel.socket
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
 	ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
 	ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
@@ -156,7 +159,8 @@ udev_common_sources =\
 	udev/udev-event.c \
 	udev/udev-watch.c \
 	udev/udev-node.c \
-	udev/udev-rules.c
+	udev/udev-rules.c \
+	udev/udev-ctrl.c
 
 udev_udevd_SOURCES = \
 	$(udev_common_sources) \
@@ -300,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
 # ------------------------------------------------------------------------------
@@ -624,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
 # ------------------------------------------------------------------------------
@@ -691,9 +686,15 @@ 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/
 
 doc-sync:
 	rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/