fix both in-tree and out-of-tree builds

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 994092775b8563b895e77ad11ed90052e2053053..3e9713fc91b20e2b0a2c1e8ac432e7baa7969bf2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -237,9 +237,10 @@ extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/floppy/create_floppy_devices
 
 # ------------------------------------------------------------------------------
-# usb_id - USB device property import
+# input_id - import input device class
 # ------------------------------------------------------------------------------
 extras_input_id_input_id_SOURCES = extras/input_id/input_id.c
+extras_input_id_input_id_LDADD = libudev/libudev.la
 libexec_PROGRAMS += extras/input_id/input_id
 
 # ------------------------------------------------------------------------------
@@ -382,13 +383,14 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
                --output $@ \
                --pkg=glib-2.0 \
                --pkg=gobject-2.0 \
+               -I$(top_builddir)/extras \
                -I$(top_srcdir)/extras \
                -D_GUDEV_COMPILATION \
                -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_builddir)/extras/gudev/gudevenumtypes.h \
+               $(or $(wildcard $(top_builddir)/extras/gudev/gudevenumtypes.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 \