X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libdocument%2FMakefile.am;h=0eb831d0a5f37252bd0b57ee86350048b86ae6a3;hb=7b5e14ea3df691578a091c563be0081ff850a367;hp=8e002a4ef9ab6318f525f0615a246ed93bacc85b;hpb=1b637c5f82269787bbfce195a684c8247adf205b;p=evince.git

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 8e002a4e..0eb831d0 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
-
 lib_LTLIBRARIES = libevdocument.la
 
 NOINST_H_FILES =				\
@@ -118,13 +116,13 @@ ev-document-type-builtins.h: stamp-ev-document-type-builtins.h
 	@true
 
 stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template $(INST_H_FILES)
-	$(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
 	&& (cmp -s xgen-etbh ev-document-type-builtins.h || cp xgen-etbh ev-document-type-builtins.h ) \
 	&& rm -f xgen-etbh \
 	&& echo timestamp > $(@F)
 
 ev-document-type-builtins.c: ev-document-type-builtins.c.template $(INST_H_FILES)
-	$(QUIET_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
 	&& (cmp -s xgen-etbc ev-document-type-builtins.c || cp xgen-etbc ev-document-type-builtins.c ) \
 	&& rm -f xgen-etbc
 
@@ -139,23 +137,23 @@ if ENABLE_INTROSPECTION
 EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
 	PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) -v --namespace EvinceDocument \
-	--add-include-path=$(srcdir) \
-	--add-include-path=. \
 	--strip-prefix=Ev \
 	--nsversion=$(EV_API_VERSION) \
+	--include=GLib-2.0 \
 	--include=Gio-2.0 \
+	--include=Gdk-2.0 \
+	--include=GdkPixbuf-2.0 \
 	--include=Gtk-2.0 \
 	--library=evdocument \
-	--libtool="$(LIBTOOL)" \
+	--libtool="$(SHAVE_SAVED_LIBTOOL)" \
 	--output $@ \
-	--pkg gobject-2.0 \
-	--pkg gio-2.0 \
-	--pkg gtk+-2.0 \
 	--pkg evince-document-$(EV_API_VERSION) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
+	-I$(srcdir) \
+	-I$(builddir) \
 	-DEVINCE_COMPILATION \
-	$(INST_H_FILES)
+	$(filter %.h,$^)
 
 girdir = $(GIRDIR)
 gir_DATA = EvinceDocument-$(EV_API_VERSION).gir