diff options
| -rw-r--r-- | Makefile.am | 56 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | extras/hid2hci/Makefile.am | 14 | ||||
| -rw-r--r-- | extras/modem-modeswitch/Makefile.am | 23 | ||||
| -rw-r--r-- | extras/udev-acl/Makefile.am | 19 | ||||
| -rw-r--r-- | extras/usb-db/Makefile.am | 23 |
6 files changed, 49 insertions, 90 deletions
diff --git a/Makefile.am b/Makefile.am index 6aacd7be94..0aa8c071ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -184,6 +184,33 @@ extras_usb_id_usb_id_LDADD = libudev/libudev-private.la extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la +extras_hid2hci_hid2hci_SOURCES = extras/hid2hci/hid2hci.c +extras_hid2hci_hid2hci_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) +extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS) + +extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c +extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) +extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS) + +extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c +extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB +extras_usb_db_usb_db_LDADD = libudev/libudev-private.la + +extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c +extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_PCI +extras_usb_db_pci_db_LDADD = libudev/libudev-private.la + +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) + # ------------------------------------------------------------------------------ # Tests # ------------------------------------------------------------------------------ @@ -243,14 +270,22 @@ if ENABLE_EXTRAS dist_udevrules_DATA += \ rules/rules.d/75-net-description.rules \ rules/rules.d/75-tty-description.rules \ - rules/rules.d/78-sound-card.rules + rules/rules.d/78-sound-card.rules \ + extras/hid2hci/70-hid2hci.rules \ + extras/modem-modeswitch/61-option-modem-modeswitch.rules \ + extras/modem-modeswitch/61-mobile-action.rules + +libexec_PROGRAMS += \ + extras/hid2hci/hid2hci \ + extras/udev-acl/udev-acl \ + extras/usb-db/usb-db \ + extras/usb-db/pci-db \ + extras/modem-modeswitch/modem-modeswitch + +install-exec-hook: udevacl-install-hook SUBDIRS += \ - extras/udev-acl \ - extras/usb-db \ - extras/hid2hci \ extras/keymap \ - extras/modem-modeswitch \ extras/gudev endif @@ -283,8 +318,12 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ # Install and uninstall hooks # ------------------------------------------------------------------------------ +install-exec-hook: libudev-install-move-hook + +uninstall-hook: libudev-uninstall-move-hook + # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed -install-exec-hook: +libudev-install-move-hook: if test "$(libdir)" != "$(rootlib_execdir)"; then \ mkdir -p $(DESTDIR)$(rootlib_execdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \ @@ -293,6 +332,9 @@ install-exec-hook: mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \ fi -uninstall-hook: +libudev-uninstall-move-hook: rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so* +udevacl-install-hook: + mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d + ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck diff --git a/configure.ac b/configure.ac index 9041eeda7d..a318768cd0 100644 --- a/configure.ac +++ b/configure.ac @@ -105,15 +105,11 @@ AC_CONFIG_FILES([ libudev/docs/Makefile libudev/docs/version.xml udev/udev.pc - extras/hid2hci/Makefile - extras/udev-acl/Makefile - extras/usb-db/Makefile extras/gudev/Makefile extras/gudev/gudev-1.0.pc extras/gudev/docs/Makefile extras/gudev/docs/version.xml extras/keymap/Makefile - extras/modem-modeswitch/Makefile ]) AC_OUTPUT diff --git a/extras/hid2hci/Makefile.am b/extras/hid2hci/Makefile.am deleted file mode 100644 index f3a73c5e86..0000000000 --- a/extras/hid2hci/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -include $(top_srcdir)/Makefile.am.inc - -libexec_PROGRAMS = \ - hid2hci - -dist_udevrules_DATA = \ - 70-hid2hci.rules - -hid2hci_SOURCES = \ - hid2hci.c - -hid2hci_LDADD = \ - $(top_builddir)/libudev/libudev-private.la \ - @LIBUSB_LIBS@ diff --git a/extras/modem-modeswitch/Makefile.am b/extras/modem-modeswitch/Makefile.am deleted file mode 100644 index e3d18b8c52..0000000000 --- a/extras/modem-modeswitch/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -include $(top_srcdir)/Makefile.am.inc - -libexec_PROGRAMS = \ - modem-modeswitch - -modem_modeswitch_SOURCES = \ - modem-modeswitch.c \ - utils.c \ - utils.h \ - ma8280p_us.c \ - ma8280p_us.h \ - option.c \ - option.h - -modem_modeswitch_CPPFLAGS = \ - $(AM_CPPFLAGS) $(LIBUSB_CFLAGS) - -modem_modeswitch_LDADD = \ - $(LIBUSB_LIBS) - -dist_udevrules_DATA = \ - 61-option-modem-modeswitch.rules \ - 61-mobile-action.rules diff --git a/extras/udev-acl/Makefile.am b/extras/udev-acl/Makefile.am deleted file mode 100644 index 1b337c3a2c..0000000000 --- a/extras/udev-acl/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -include $(top_srcdir)/Makefile.am.inc - -libexec_PROGRAMS = \ - udev-acl - -udev_acl_SOURCES = \ - udev-acl.c - -udev_acl_CPPFLAGS = \ - $(AM_CPPFLAGS) $(GLIB_CFLAGS) - -udev_acl_LDADD = \ - -lacl $(top_builddir)/libudev/libudev-private.la $(GLIB_LIBS) - -dist_udevrules_DATA = 70-acl.rules - -install-exec-hook: - mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d - ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck diff --git a/extras/usb-db/Makefile.am b/extras/usb-db/Makefile.am deleted file mode 100644 index fa974b5f8f..0000000000 --- a/extras/usb-db/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -include $(top_srcdir)/Makefile.am.inc - -libexec_PROGRAMS = \ - usb-db pci-db - -usb_db_SOURCES = \ - usb-db.c - -usb_db_CPPFLAGS = \ - $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB - -usb_db_LDADD = \ - $(top_builddir)/libudev/libudev-private.la - - -pci_db_SOURCES = \ - $(usb_db_SOURCES) - -pci_db_CPPFLAGS = \ - $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI - -pci_db_LDADD = \ - $(top_builddir)/libudev/libudev-private.la |