export udev_device_get_tags_list_entry()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3780f50797df9659b0fb64efb791a5785a280930..9d3fefd702b4731c902b7d3ece7dc2a7580518c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,9 @@ CLEANFILES =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=7
+LIBUDEV_CURRENT=8
 LIBUDEV_REVISION=0
-LIBUDEV_AGE=7
+LIBUDEV_AGE=8
 
 SUBDIRS += libudev/docs
 
@@ -194,6 +194,7 @@ dist_udevrules_DATA += \
 # ------------------------------------------------------------------------------
 extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
 extras_firmware_firmware_LDADD = libudev/libudev-private.la
+extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 dist_udevrules_DATA += extras/firmware/50-firmware.rules
 libexec_PROGRAMS = extras/firmware/firmware
 
@@ -239,7 +240,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 +449,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,7 +541,7 @@ dist_udevkeymap_DATA = \
 udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
        extras/keymap/force-release-maps/samsung-other \
-       extras/keymap/force-release-maps/dell-studio-1557
+       extras/keymap/force-release-maps/common-volume-keys
 
 extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
        mkdir -p extras/keymap