[libview] Fix rendering issue in dual/continuous mode

[evince.git] / libview / Makefile.am

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 0bf23d04267f76842b15048c9b11d7453fc87bef..ef38f9952f680c4d7d1503e887de80dd9f3fdea0 100644 (file)
--- 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,7 +101,7 @@ 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=$(top_builddir)/libdocument \
        --strip-prefix=Ev \
@@ -114,7 +114,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES)
        --include=Gtk-2.0 \
        --include=EvinceDocument-$(EV_API_VERSION) \
        --library=evview \
-       --libtool="$(SHAVE_SAVED_LIBTOOL)" \
+       --libtool="$(LIBTOOL)" \
        --output $@ \
        --pkg evince-document-$(EV_API_VERSION) \
        --pkg evince-view-$(EV_API_VERSION) \
@@ -133,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