X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=eeef6beadbc213db77a93b81cfbad2098192848b;hb=c860480dbb7b6c41bb811d96d27291f3b99751d6;hp=b18ac91f00be105a40909f1eef5e8453e3a00fe2;hpb=59d93adb29fae25220955d44a5cd25f0d99e3528;p=elogind.git diff --git a/Makefile.am b/Makefile.am index b18ac91f0..eeef6bead 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,11 +8,16 @@ dist_udevconf_DATA = \ EXTRA_DIST = \ autogen.sh \ - libudev/exported_symbols + libudev/exported_symbols \ + extras/gudev/gudevmarshal.list \ + extras/gudev/gudevenumtypes.h.template \ + extras/gudev/gudevenumtypes.c.template CLEANFILES = \ udev-$(VERSION).tar.gz udev-$(VERSION).tar.bz2 +BUILT_SOURCES = + ACLOCAL_AMFLAGS = -I m4 AM_MAKEFLAGS = --no-print-directory @@ -41,9 +46,6 @@ changelog: @ cat ChangeLog.tmp >> ChangeLog @ rm ChangeLog.tmp -test-run: - cd test && ./udev-test.pl - test-install: rm -rf $(PWD)/udev-test-install/ make DESTDIR=$(PWD)/udev-test-install install @@ -61,6 +63,9 @@ doc-sync: rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/ rsync -av --delete extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/ +INSTALL_EXEC_HOOKS = libudev-install-move-hook +UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook + include_HEADERS = libudev/libudev.h # ------------------------------------------------------------------------------ @@ -97,6 +102,45 @@ libudev_libudev_private_la_SOURCES =\ libudev_libudev_private_la_LIBADD = +extras_gudev_libgudev_1_0_la_SOURCES = \ + extras/gudev/gudevenums.h \ + extras/gudev/gudevenumtypes.h \ + extras/gudev/gudevenumtypes.h\ + extras/gudev/gudevtypes.h \ + extras/gudev/gudevclient.h \ + extras/gudev/gudevclient.c \ + extras/gudev/gudevdevice.h \ + extras/gudev/gudevdevice.c \ + extras/gudev/gudevprivate.h + +dist_extras_gudev_libgudev_1_0_la_SOURCES = \ + extras/gudev/gudevmarshal.h \ + extras/gudev/gudevmarshal.c \ + extras/gudev/gudevenumtypes.h \ + extras/gudev/gudevenumtypes.c + +extras_gudev_libgudev_1_0_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_builddir)/extras \ + -I$(top_srcdir)/extras \ + -I$(top_builddir)/extras/gudev \ + -I$(top_srcdir)/extras/gudev \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -D_GUDEV_COMPILATION \ + -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ + -DG_LOG_DOMAIN=\"GUdev\" +extras_gudev_libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS) +extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS) + +LIBGUDEV_CURRENT=0 +LIBGUDEV_REVISION=1 +LIBGUDEV_AGE=0 + +extras_gudev_libgudev_1_0_la_LDFLAGS = \ + -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \ + -export-dynamic -no-undefined \ + -export-symbols-regex '^g_udev_.*' + # ------------------------------------------------------------------------------ # Programs # ------------------------------------------------------------------------------ @@ -187,9 +231,44 @@ 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) + +extras_keymap_keymap_SOURCES = extras/keymap/keymap.c +nodist_extras_keymap_keymap_SOURCES = \ + extras/keymap/keys-from-name.h \ + extras/keymap/keys-to-name.h + # ------------------------------------------------------------------------------ # Tests # ------------------------------------------------------------------------------ + +TESTS = test/udev-test.pl + check_PROGRAMS = \ libudev/test-libudev \ udev/test-udev @@ -229,31 +308,6 @@ EXTRA_DIST += \ rules/suse \ rules/gentoo -# ------------------------------------------------------------------------------ -# Conditionals (SElinux, etc…) -# ------------------------------------------------------------------------------ -if WITH_SELINUX -libudev_libudev_private_la_SOURCES += \ - libudev/libudev-selinux-private.c -libudev_libudev_private_la_LIBADD += \ - $(SELINUX_LIBS) -endif - -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 - -SUBDIRS += \ - extras/udev-acl \ - extras/usb-db \ - extras/hid2hci \ - extras/keymap \ - extras/modem-modeswitch \ - extras/gudev -endif - # ------------------------------------------------------------------------------ # Pkg-config, docs and man pages # ------------------------------------------------------------------------------ @@ -280,11 +334,135 @@ EXTRA_DIST += \ %.7 %.8 : %.xml $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +# ------------------------------------------------------------------------------ +# Conditionals (SElinux, etc…) +# ------------------------------------------------------------------------------ +if WITH_SELINUX +libudev_libudev_private_la_SOURCES += \ + libudev/libudev-selinux-private.c +libudev_libudev_private_la_LIBADD += \ + $(SELINUX_LIBS) +endif + +if ENABLE_EXTRAS +INSTALL_EXEC_HOOKS += udevacl-install-hook + +lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la + +dist_udevrules_DATA += \ + rules/rules.d/75-net-description.rules \ + rules/rules.d/75-tty-description.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 \ + extras/keymap/95-keymap.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 \ + extras/keymap/keymap + +dist_libexec_SCRIPTS += \ + extras/keymap/findkeyboards + +BUILT_SOURCES += \ + $(nodist_extras_keymap_keymap_SOURCES) \ + $(dist_extras_gudev_libgudev_1_0_la_SOURCES) + +TESTS += extras/keymap/check-keymaps.sh + +check_DATA = extras/keymap/keys.txt + +CLEANFILES += \ + extras/keymap/keys.txt \ + extras/keymap/keys-from-name.gperf + +dist_doc_DATA = extras/keymap/README.keymap.txt + +udevkeymapdir = $(libexecdir)/keymaps +dist_udevkeymap_DATA = \ + extras/keymap/keymaps/acer \ + extras/keymap/keymaps/acer-aspire_5920g \ + extras/keymap/keymaps/acer-travelmate_c300 \ + extras/keymap/keymaps/asus \ + extras/keymap/keymaps/compaq-e_evo \ + extras/keymap/keymaps/dell \ + extras/keymap/keymaps/everex-xt5000 \ + extras/keymap/keymaps/fujitsu-amilo_pa_2548 \ + extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ + extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \ + extras/keymap/keymaps/fujitsu-amilo_si_1520 \ + extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ + extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ + extras/keymap/keymaps/hewlett-packard \ + extras/keymap/keymaps/hewlett-packard-2510p_2530p \ + extras/keymap/keymaps/hewlett-packard-compaq_elitebook \ + extras/keymap/keymaps/hewlett-packard-pavilion \ + extras/keymap/keymaps/hewlett-packard-presario-2100 \ + extras/keymap/keymaps/hewlett-packard-tablet \ + extras/keymap/keymaps/hewlett-packard-tx2 \ + extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ + extras/keymap/keymaps/lenovo-3000 \ + extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ + extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ + extras/keymap/keymaps/maxdata-pro_7000 \ + extras/keymap/keymaps/medion-fid2060 \ + extras/keymap/keymaps/medionnb-a555 \ + extras/keymap/keymaps/micro-star \ + extras/keymap/keymaps/module-asus-w3j \ + extras/keymap/keymaps/module-ibm \ + extras/keymap/keymaps/module-lenovo \ + extras/keymap/keymaps/module-sony \ + extras/keymap/keymaps/module-sony-old \ + extras/keymap/keymaps/oqo-model2 \ + extras/keymap/keymaps/samsung-other \ + extras/keymap/keymaps/samsung-sq1us \ + extras/keymap/keymaps/samsung-sx20s \ + extras/keymap/keymaps/toshiba-satellite_a100 \ + extras/keymap/keymaps/toshiba-satellite_a110 \ + extras/keymap/keymaps/zepto-znote + +libgudev_includedir=$(includedir)/gudev-1.0/gudev +libgudev_include_HEADERS = \ + extras/gudev/gudev.h \ + extras/gudev/gudevenums.h \ + extras/gudev/gudevenumtypes.h \ + extras/gudev/gudevtypes.h \ + extras/gudev/gudevclient.h \ + extras/gudev/gudevdevice.h + +pkgconfig_DATA += extras/gudev/gudev-1.0.pc + +SUBDIRS += \ + extras/gudev/docs +endif + +if ENABLE_INTROSPECTION +girdir = $(GIRDIR) +gir_DATA = extras/gudev/GUdev-1.0.gir + +typelibsdir = $(GIRTYPELIBDIR) +typelibs_DATA = extras/gudev/GUdev-1.0.typelib + +EXTRA_DIST += GUdev-1.0.gir +CLEANFILES += $(gir_DATA) $(typelibs_DATA) +endif # ENABLE_INTROSPECTION + +CLEANFILES += $(BUILT_SOURCES) + # ------------------------------------------------------------------------------ # Install and uninstall hooks # ------------------------------------------------------------------------------ +install-exec-hook: $(INSTALL_EXEC_HOOKS) + +uninstall-hook: $(UNINSTALL_EXEC_HOOKS) + # 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 +471,65 @@ 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 + +# ------------------------------------------------------------------------------ +# Custom rules +# ------------------------------------------------------------------------------ + +extras/keymap/keys.txt: /usr/include/linux/input.h + $(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@ + +extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ + +extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile + $(AM_V_GEN)$(GPERF) -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ + +extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ + +extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list + $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ + +extras/gudev/gudevmarshal.c: extras/gudev/gudevmarshal.list + $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \ + glib-genmarshal $< --prefix=g_udev_marshal --body >> $@ + +extras/gudev/gudevenumtypes.h: extras/gudev/gudevenumtypes.h.template extras/gudev/gudevenums.h + $(AM_V_GEN)glib-mkenums --template $^ > \ + $@.tmp && mv $@.tmp $@ + +extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gudev/gudevenums.h + $(AM_V_GEN)glib-mkenums --template $^ > \ + $@.tmp && mv $@.tmp $@ + +extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am + $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ + $(G_IR_SCANNER) -v \ + --namespace GUdev \ + --nsversion=1.0 \ + --include=GObject-2.0 \ + --library=gudev-1.0 \ + --output $@ \ + --pkg=glib-2.0 \ + --pkg=gobject-2.0 \ + -I$(top_srcdir)/extras \ + -D_GUDEV_COMPILATION \ + -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ + $(top_srcdir)/extras/gudev/gudev.h \ + $(top_srcdir)/extras/gudev/gudevtypes.h \ + $(top_srcdir)/extras/gudev/gudevenums.h \ + $(top_srcdir)/extras/gudev/gudevenumtypes.h \ + $(top_srcdir)/extras/gudev/gudevclient.h \ + $(top_srcdir)/extras/gudev/gudevdevice.h \ + $(top_srcdir)/extras/gudev/gudevclient.c \ + $(top_srcdir)/extras/gudev/gudevdevice.c + +extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) + $(AM_V_GEN)g-ir-compiler $< -o $@