X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=93302185e31b22e95673716e34b02f1b1eb91be1;hb=102831867ce5c0618fc06a9a3386881300d5994e;hp=5807cbbeb538b458ecf4406677086ab1eef9823a;hpb=402520cc08a66762a3683dfd11261f004fa42cb8;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 5807cbbeb..93302185e 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 @@ -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 # ------------------------------------------------------------------------------ @@ -214,6 +258,11 @@ extras_modem_modeswitch_modem_modeswitch_SOURCES =\ 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 # ------------------------------------------------------------------------------ @@ -259,6 +308,32 @@ EXTRA_DIST += \ rules/suse \ rules/gentoo +# ------------------------------------------------------------------------------ +# Pkg-config, docs and man pages +# ------------------------------------------------------------------------------ +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = \ + libudev/libudev.pc \ + udev/udev.pc + +writing_udev_rulesdir = $(docdir)/writing_udev_rules +dist_writing_udev_rules_DATA = \ + docs/writing_udev_rules/index.html + +dist_man_MANS = \ + udev/udev.7 \ + udev/udevadm.8 \ + udev/udevd.8 \ + extras/scsi_id/scsi_id.8 + +EXTRA_DIST += \ + udev/udev.xml \ + udev/udevadm.xml \ + udev/udevd.xml + +%.7 %.8 : %.xml + $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + # ------------------------------------------------------------------------------ # Conditionals (SElinux, etc…) # ------------------------------------------------------------------------------ @@ -272,52 +347,112 @@ 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/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/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/keymap \ - extras/gudev + extras/gudev/docs endif -# ------------------------------------------------------------------------------ -# Pkg-config, docs and man pages -# ------------------------------------------------------------------------------ -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = \ - libudev/libudev.pc \ - udev/udev.pc - -writing_udev_rulesdir = $(docdir)/writing_udev_rules -dist_writing_udev_rules_DATA = \ - docs/writing_udev_rules/index.html +if ENABLE_INTROSPECTION +girdir = $(GIRDIR) +gir_DATA = extras/gudev/GUdev-1.0.gir -dist_man_MANS = \ - udev/udev.7 \ - udev/udevadm.8 \ - udev/udevd.8 \ - extras/scsi_id/scsi_id.8 +typelibsdir = $(GIRTYPELIBDIR) +typelibs_DATA = extras/gudev/GUdev-1.0.typelib -EXTRA_DIST += \ - udev/udev.xml \ - udev/udevadm.xml \ - udev/udevd.xml +EXTRA_DIST += GUdev-1.0.gir +CLEANFILES += $(gir_DATA) $(typelibs_DATA) +endif # ENABLE_INTROSPECTION -%.7 %.8 : %.xml - $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +CLEANFILES += $(BUILT_SOURCES) # ------------------------------------------------------------------------------ # Install and uninstall hooks @@ -342,3 +477,60 @@ libudev-uninstall-move-hook: 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 \ + --library-path=extras/gudev \ + --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 $@