chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gudev: fix out-of-tree build
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 604a33bc3a4297fdae94f3501d9c26522093c5b6..21a2b9b31664a080bfe1c2f6842e48a52925ef4e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,7 @@ AM_LDFLAGS = \
        -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
        -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --enable-gtk-doc \
-       --enable-extras
+       --enable-gtk-doc
 
 CLEANFILES =
 
 
 CLEANFILES =
 
@@ -30,7 +29,7 @@ CLEANFILES =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=5
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=5
 
 SUBDIRS += libudev/docs
 LIBUDEV_AGE=5
 
 SUBDIRS += libudev/docs
@@ -259,8 +258,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.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
 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
@@ -280,17 +278,17 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/v4l_id/v4l_id
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
 libexec_PROGRAMS += extras/v4l_id/v4l_id
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
+if ENABLE_EXTRAS
 # ------------------------------------------------------------------------------
 # conditional extras (need glib, libusb, libacl, ...)
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 # conditional extras (need glib, libusb, libacl, ...)
 # ------------------------------------------------------------------------------
-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
 
 # ------------------------------------------------------------------------------
 dist_udevrules_DATA += \
        rules/rules.d/75-net-description.rules \
        rules/rules.d/75-tty-description.rules \
        rules/rules.d/78-sound-card.rules
 
 # ------------------------------------------------------------------------------
-# GUdev
+# GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
 LIBGUDEV_CURRENT=0
 LIBGUDEV_REVISION=1
 # ------------------------------------------------------------------------------
 LIBGUDEV_CURRENT=0
 LIBGUDEV_REVISION=1
@@ -336,7 +334,6 @@ extras_gudev_libgudev_1_0_la_CPPFLAGS = \
        -I$(top_srcdir)/extras/gudev \
        -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
        -D_GUDEV_COMPILATION \
        -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)
        -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)
@@ -366,8 +363,10 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud
        $(AM_V_GEN)glib-mkenums --template $^ > \
            $@.tmp && mv $@.tmp $@
 
        $(AM_V_GEN)glib-mkenums --template $^ > \
            $@.tmp && mv $@.tmp $@
 
+if ENABLE_INTROSPECTION
 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 \
 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 \
        $(G_IR_SCANNER) -v \
                --namespace GUdev \
                --nsversion=1.0 \
@@ -378,12 +377,13 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
                --pkg=glib-2.0 \
                --pkg=gobject-2.0 \
                -I$(top_srcdir)/extras \
                --pkg=glib-2.0 \
                --pkg=gobject-2.0 \
                -I$(top_srcdir)/extras \
+               -I$(top_builddir)/extras \
                -D_GUDEV_COMPILATION \
                -D_GUDEV_COMPILATION \
-               -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+               -D_GUDEV_WORK_AROUND_DEV_T_BUG \
                $(top_srcdir)/extras/gudev/gudev.h \
                $(top_srcdir)/extras/gudev/gudevtypes.h \
                $(top_srcdir)/extras/gudev/gudevenums.h \
                $(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_builddir)/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/gudevclient.h \
                $(top_srcdir)/extras/gudev/gudevdevice.h \
                $(top_srcdir)/extras/gudev/gudevclient.c \
@@ -392,14 +392,12 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
 extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
        $(AM_V_GEN)g-ir-compiler $< -o $@
 
 extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
        $(AM_V_GEN)g-ir-compiler $< -o $@
 
-if ENABLE_INTROSPECTION
 girdir = $(GIRDIR)
 gir_DATA = extras/gudev/GUdev-1.0.gir
 
 typelibsdir = $(GIRTYPELIBDIR)
 typelibs_DATA = extras/gudev/GUdev-1.0.typelib
 
 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 += $(gir_DATA) $(typelibs_DATA)
 endif # ENABLE_INTROSPECTION
 
@@ -422,8 +420,8 @@ dist_udevrules_DATA += extras/udev-acl/70-acl.rules
 libexec_PROGRAMS += extras/udev-acl/udev-acl
 
 udevacl-install-hook:
 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
 
 
 INSTALL_EXEC_HOOKS += udevacl-install-hook
 
@@ -439,7 +437,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
 # 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
 
 extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/usb-db/pci-db
 
@@ -486,7 +484,9 @@ CLEANFILES += \
 udevkeymapdir = $(libexecdir)/keymaps
 dist_udevkeymap_DATA = \
        extras/keymap/keymaps/acer \
 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_5920g \
+       extras/keymap/keymaps/acer-aspire_6920 \
        extras/keymap/keymaps/acer-travelmate_c300 \
        extras/keymap/keymaps/asus \
        extras/keymap/keymaps/compaq-e_evo \
        extras/keymap/keymaps/acer-travelmate_c300 \
        extras/keymap/keymaps/asus \
        extras/keymap/keymaps/compaq-e_evo \
@@ -509,6 +509,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/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 \
        extras/keymap/keymaps/maxdata-pro_7000 \
        extras/keymap/keymaps/medion-fid2060 \
        extras/keymap/keymaps/medionnb-a555 \
@@ -527,7 +529,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/zepto-znote
 
 extras/keymap/keys.txt: /usr/include/linux/input.h
        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 }' < $< > $@
 
 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 }' < $< > $@
Unnamed repository; edit this file 'description' to name the repository.