X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2FMakefile.am;h=89cfa3657dc79d186d9f86df699ccba67cdac0aa;hb=70919434b478e8f1073eed56097d29b6f2dba314;hp=3a16b26bb9c6b3e882416f86623bdfacda5fe5df;hpb=229170c1870cdc32fdd7dcf28136f437dc4cbab2;p=evince.git

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 3a16b26b..89cfa365 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -10,9 +10,9 @@ NOINST_H_FILES =			\
 	ev-view-private.h
 
 INST_H_FILES = 				\
+	ev-document-model.h		\
 	ev-jobs.h			\
 	ev-job-scheduler.h		\
-	ev-page-cache.h			\
 	ev-stock-icons.h		\
 	ev-view.h			\
 	ev-view-type-builtins.h
@@ -22,9 +22,9 @@ header_DATA = $(INST_H_FILES)
 
 libevview_la_SOURCES = 			\
 	ev-annotation-window.c		\
+	ev-document-model.c		\
 	ev-jobs.c			\
 	ev-job-scheduler.c		\
-	ev-page-cache.c			\
 	ev-pixbuf-cache.c		\
 	ev-stock-icons.c		\
 	ev-timeline.c			\
@@ -71,23 +71,23 @@ BUILT_SOURCES = 			\
 CLEANFILES = $(BUILT_SOURCES) stamp-ev-view-type-builtins.h
 
 ev-view-marshal.h: $(srcdir)/ev-view-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@
 
 ev-view-marshal.c: $(srcdir)/ev-view-marshal.list
 	echo '#include <config.h>' > ev-view-marshal.c
-	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal --body >> $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal --body >> $@
 
 ev-view-type-builtins.h: stamp-ev-view-type-builtins.h
 	@true
 
 stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_FILES)
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \
 	&& (cmp -s xgen-etbh ev-view-type-builtins.h || cp xgen-etbh ev-view-type-builtins.h ) \
 	&& rm -f xgen-etbh \
 	&& echo timestamp > $(@F)
 
 ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_FILES)
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
+	$(AM_V_GEN)$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \
 	&& (cmp -s xgen-etbc ev-view-type-builtins.c || cp xgen-etbc ev-view-type-builtins.c ) \
 	&& rm -f xgen-etbc
 
@@ -101,29 +101,27 @@ EXTRA_DIST = \
 if ENABLE_INTROSPECTION
 
 EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES)
-	PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
+	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) -v --namespace EvinceView \
-	--add-include-path=$(srcdir) \
-	--add-include-path=. \
-	--add-include-path=$(top_srcdir) \
-	--add-include-path=$(top_builddir) \
 	--add-include-path=$(top_builddir)/libdocument \
 	--strip-prefix=Ev \
 	--nsversion=$(EV_API_VERSION) \
+	--include=GLib-2.0 \
+	--include=GObject-2.0 \
 	--include=Gio-2.0 \
+	--include=Gdk-2.0 \
+	--include=GdkPixbuf-2.0 \
 	--include=Gtk-2.0 \
-	--include=EvDocument-$(EV_API_VERSION) \
+	--include=EvinceDocument-$(EV_API_VERSION) \
 	--library=evview \
-	--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) \
 	--pkg evince-view-$(EV_API_VERSION) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-DEVINCE_COMPILATION \
-	$(INST_H_FILES)
+	$(filter %.h,$^)
 
 girdir = $(GIRDIR)
 gir_DATA = EvinceView-$(EV_API_VERSION).gir
@@ -135,10 +133,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=$(top_builddir)/libdocument \
 	$(G_IR_COMPILER_OPTS) \
 	$< -o $@
 
 endif # ENABLE_INTROSPECTION
+
+-include $(top_srcdir)/git.mk