X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libdocument%2FMakefile.am;h=4cbc34ea4310d0a18d12eace67f979e44c4d3faa;hb=5e1b11aee0641f6075f2d6eabfcfabece5e2f409;hp=82b08a56f564503d02785395144e3c69a3660960;hpb=e4e11c845174f618cae495b1b99e53b2a4ab11fb;p=evince.git

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 82b08a56..4cbc34ea 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 =				\
@@ -13,6 +11,7 @@ INST_H_FILES = 					\
 	ev-backends-manager.h			\
 	ev-document-factory.h			\
 	ev-document-annotations.h		\
+	ev-document-attachments.h		\
 	ev-document-find.h			\
 	ev-document-fonts.h			\
 	ev-document-forms.h			\
@@ -59,6 +58,7 @@ libevdocument_la_SOURCES=			\
 	ev-init.c				\
 	ev-document.c				\
 	ev-document-annotations.c		\
+	ev-document-attachments.c		\
 	ev-document-factory.c			\
 	ev-document-thumbnails.c		\
 	ev-document-fonts.c                     \
@@ -118,13 +118,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
 
@@ -136,8 +136,8 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
-	PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
+EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument_la_SOURCES))
+	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) -v --namespace EvinceDocument \
 	--strip-prefix=Ev \
 	--nsversion=$(EV_API_VERSION) \
@@ -147,7 +147,7 @@ EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
 	--include=GdkPixbuf-2.0 \
 	--include=Gtk-2.0 \
 	--library=evdocument \
-	--libtool="$(LIBTOOL)" \
+	--libtool="$(SAVED_LIBTOOL)" \
 	--output $@ \
 	--pkg evince-document-$(EV_API_VERSION) \
 	-I$(top_srcdir) \
@@ -155,7 +155,8 @@ EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
 	-I$(srcdir) \
 	-I$(builddir) \
 	-DEVINCE_COMPILATION \
-	$(filter %.h,$^)
+	$(filter %.h,$^) \
+	$(filter %.c,$^)
 
 girdir = $(GIRDIR)
 gir_DATA = EvinceDocument-$(EV_API_VERSION).gir
@@ -167,10 +168,12 @@ EXTRA_DIST += $(gir_DATA)
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
 %.typelib: %.gir
-	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) \
+	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) \
 	--includedir=$(srcdir) \
 	--includedir=. \
 	$(G_IR_COMPILER_OPTS) \
 	$< -o $@
 
 endif # ENABLE_INTROSPECTION
+
+-include $(top_srcdir)/git.mk