X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=0599bb24cf27b3c3daa995c72ba270f00ca93652;hb=b5d9178f0e0e5e2e51df74b40636144eca362209;hp=2ce9eb564bda784551895def0194ddfc39c68a85;hpb=24569e24dc94a7cffb8031eb0055e8d06cbdcb72;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 2ce9eb564..0599bb24c 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
@@ -160,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) \
@@ -277,6 +277,7 @@ extras_scsi_id_scsi_id_SOURCES =\
 extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/scsi_id/scsi_id
 dist_man_MANS += extras/scsi_id/scsi_id.8
+EXTRA_DIST += extras/scsi_id/README
 
 # ------------------------------------------------------------------------------
 # usb_id - USB device property import
@@ -437,7 +438,10 @@ EXTRA_DIST += \
 	extras/gudev/COPYING \
 	extras/gudev/gudevmarshal.list \
 	extras/gudev/gudevenumtypes.h.template \
-	extras/gudev/gudevenumtypes.c.template
+	extras/gudev/gudevenumtypes.c.template \
+	extras/gudev/gjs-example.js \
+	extras/gudev/seed-example-enum.js \
+	extras/gudev/seed-example.js
 
 extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list
 	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
@@ -636,23 +640,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
 # ------------------------------------------------------------------------------
@@ -711,7 +698,7 @@ git-sync:
 	git push --tags $(VERSION)
 
 tar-sync:
-	scp udev-$(VERSION).gz master.kernel.org:/pub/linux/utils/kernel/hotplug/
+	scp udev-$(VERSION).tar.gz master.kernel.org:/pub/linux/utils/kernel/hotplug/
 
 doc-sync:
 	rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/