X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=2185614c43822572fccdf51f559c8b18d90b2255;hb=26347a4c5538008318188118872490128f43fcd3;hp=d785f05611ce33e780cb212c38ff83d49a9d6f8e;hpb=5daaf29d7194970d102b866f674eff7c1ba514a9;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index d785f0561..2185614c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ CLEANFILES =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=5
 
 SUBDIRS += libudev/docs
@@ -259,8 +259,7 @@ extras_scsi_id_scsi_id_SOURCES =\
 	extras/scsi_id/scsi_id.c \
 	extras/scsi_id/scsi_serial.c \
 	extras/scsi_id/scsi.h \
-	extras/scsi_id/scsi_id.h \
-	extras/scsi_id/bsg.h
+	extras/scsi_id/scsi_id.h
 extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/scsi_id/scsi_id
 dist_man_MANS += extras/scsi_id/scsi_id.8
@@ -336,7 +335,6 @@ extras_gudev_libgudev_1_0_la_CPPFLAGS = \
 	-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)
@@ -368,6 +366,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud
 
 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 \
+	LD_LIBRARY_PATH=$(top_builddir)/extras/gudev \
 	$(G_IR_SCANNER) -v \
 		--namespace GUdev \
 		--nsversion=1.0 \
@@ -422,8 +421,8 @@ dist_udevrules_DATA += extras/udev-acl/70-acl.rules
 libexec_PROGRAMS += extras/udev-acl/udev-acl
 
 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
+	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
 INSTALL_EXEC_HOOKS += udevacl-install-hook
 
@@ -439,7 +438,7 @@ libexec_PROGRAMS += extras/usb-db/usb-db
 # pci-db - read PCI vendor/device string database
 # ------------------------------------------------------------------------------
 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_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
 extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/usb-db/pci-db
 
@@ -486,6 +485,7 @@ CLEANFILES += \
 udevkeymapdir = $(libexecdir)/keymaps
 dist_udevkeymap_DATA = \
 	extras/keymap/keymaps/acer \
+	extras/keymap/keymaps/acer-aspire_5720 \
 	extras/keymap/keymaps/acer-aspire_5920g \
 	extras/keymap/keymaps/acer-aspire_6920 \
 	extras/keymap/keymaps/acer-travelmate_c300 \
@@ -510,6 +510,8 @@ dist_udevkeymap_DATA = \
 	extras/keymap/keymaps/lenovo-3000 \
 	extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
 	extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
+	extras/keymap/keymaps/logitech-wave \
+	extras/keymap/keymaps/logitech-wave-cordless \
 	extras/keymap/keymaps/maxdata-pro_7000 \
 	extras/keymap/keymaps/medion-fid2060 \
 	extras/keymap/keymaps/medionnb-a555 \
@@ -528,7 +530,7 @@ dist_udevkeymap_DATA = \
 	extras/keymap/keymaps/zepto-znote
 
 extras/keymap/keys.txt: /usr/include/linux/input.h
-	$(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@
+	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 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 }' < $< > $@