X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=93302185e31b22e95673716e34b02f1b1eb91be1;hb=102831867ce5c0618fc06a9a3386881300d5994e;hp=9a9ca78adc6d767c3964231408a75fb139f50367;hpb=ca7ad57020a3f8ffd71562de3bde355814725545;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 9a9ca78ad..93302185e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -495,27 +495,28 @@ 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
-	glib-genmarshal $< --prefix=g_udev_marshal --header > $@
+	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
 extras/gudev/gudevmarshal.c: extras/gudev/gudevmarshal.list
-	echo "#include \"gudevmarshal.h\"" > $@ && \
+	$(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
-	glib-mkenums --template $^ > \
-	    gudevenumtypes.h.tmp && mv gudevenumtypes.h.tmp gudevenumtypes.h
+	$(AM_V_GEN)glib-mkenums --template $^ > \
+	    $@.tmp && mv $@.tmp $@
 
 extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gudev/gudevenums.h
-	glib-mkenums --template $^ > \
-	    gudevenumtypes.c.tmp && mv gudevenumtypes.c.tmp gudevenumtypes.c
+	$(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
-	PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+	$(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 \
@@ -532,4 +533,4 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil
 		$(top_srcdir)/extras/gudev/gudevdevice.c
 
 extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
-	g-ir-compiler $< -o $@
+	$(AM_V_GEN)g-ir-compiler $< -o $@