X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=68a68d9166ab7716082f12d06bbd3286c746a784;hb=233a922112408c7ed49bd72e73be228e231d46ba;hp=3780f50797df9659b0fb64efb791a5785a280930;hpb=e0fcf21c030027101338c7673c5cb814b82261d1;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 3780f5079..68a68d916 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,7 +239,7 @@ dist_udevrules_DATA += extras/floppy/60-floppy.rules
 # input_id - import input device class
 # ------------------------------------------------------------------------------
 extras_input_id_input_id_SOURCES = extras/input_id/input_id.c
-extras_input_id_input_id_LDADD = libudev/libudev.la
+extras_input_id_input_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/input_id/input_id
 
 # ------------------------------------------------------------------------------
@@ -448,24 +448,21 @@ extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/usb-db/pci-db
 
 # ------------------------------------------------------------------------------
-# modem-modeswitch - magic config switch for 3G modems
+# mobile-action-modeswitch - switch Mobile Action cables into serial mode
 # ------------------------------------------------------------------------------
-extras_modem_modeswitch_modem_modeswitch_SOURCES =\
-	extras/modem-modeswitch/modem-modeswitch.c \
-	extras/modem-modeswitch/utils.c \
-	extras/modem-modeswitch/utils.h \
-	extras/modem-modeswitch/ma8280p_us.c \
-	extras/modem-modeswitch/ma8280p_us.h \
-	extras/modem-modeswitch/option.c \
-	extras/modem-modeswitch/option.h
-extras_modem_modeswitch_modem_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
-extras_modem_modeswitch_modem_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
+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/modem-modeswitch/61-option-modem-modeswitch.rules \
-	extras/modem-modeswitch/61-mobile-action.rules
+	extras/mobile-action-modeswitch/61-mobile-action.rules
 
-libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
+libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
 
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys
@@ -543,6 +540,7 @@ dist_udevkeymap_DATA = \
 udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
 	extras/keymap/force-release-maps/samsung-other \
+	extras/keymap/force-release-maps/fujitsu-amilo-si1848 \
 	extras/keymap/force-release-maps/dell-studio-1557
 
 extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h