[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / libview / Makefile.am

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 980bc002c105a7cdbb87636e0755c96a5efdcdda..7766c4b96cf111cf794b8b91ec85a9bf9c005891 100644 (file)
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libevview.la
+lib_LTLIBRARIES = libevview3.la
 
 NOINST_H_FILES =                       \
        ev-annotation-window.h          \
@@ -12,20 +12,23 @@ NOINST_H_FILES =                    \
        ev-view-marshal.h               \
        ev-view-private.h
 
-INST_H_FILES =                                 \
+INST_H_SRC_FILES =                     \
        ev-document-model.h             \
        ev-jobs.h                       \
        ev-job-scheduler.h              \
        ev-print-operation.h            \
        ev-stock-icons.h                \
        ev-view.h                       \
-       ev-view-presentation.h          \
+       ev-view-presentation.h
+
+INST_H_FILES =                                 \
+       $(INST_H_SRC_FILES)             \
        ev-view-type-builtins.h
 
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
 header_DATA = $(INST_H_FILES)
 
-libevview_la_SOURCES =                         \
+libevview3_la_SOURCES =                        \
        ev-annotation-window.c          \
        ev-document-model.c             \
        ev-loading-window.c             \
@@ -46,8 +49,8 @@ libevview_la_SOURCES =                        \
        $(NOINST_H_FILES)               \
        $(INST_H_FILES)
 
-libevview_la_CPPFLAGS = \
-       -DDATADIR=\"$(pkgdatadir)\"             \
+libevview3_la_CPPFLAGS = \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -DG_LOG_DOMAIN=\"EvinceView\"           \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
        -DEVINCE_COMPILATION                    \
@@ -56,20 +59,20 @@ libevview_la_CPPFLAGS = \
        -I$(top_builddir)                       \
        $(AM_CPPFLAGS)
 
-libevview_la_CFLAGS = \
+libevview3_la_CFLAGS = \
        $(LIBVIEW_CFLAGS)       \
        $(WARN_CFLAGS)          \
        $(DISABLE_DEPRECATED)   \
        $(AM_CFLAGS)
 
-libevview_la_LDFLAGS = \
+libevview3_la_LDFLAGS = \
        -version-info $(EV_VIEW_LT_VERSION_INFO)        \
        -no-undefined   \
        -export-symbols-regex "^ev_*"   \
        $(AM_LDFLAGS)
 
-libevview_la_LIBADD = \
-       $(top_builddir)/libdocument/libevdocument.la \
+libevview3_la_LIBADD = \
+       $(top_builddir)/libdocument/libevdocument3.la \
        $(LIBVIEW_LIBS)
 
 BUILT_SOURCES =                        \
@@ -78,7 +81,10 @@ BUILT_SOURCES =                      \
        ev-view-type-builtins.c         \
        ev-view-type-builtins.h
 
-CLEANFILES = $(BUILT_SOURCES) stamp-ev-view-type-builtins.h
+CLEANFILES =                           \
+       $(BUILT_SOURCES)                \
+       stamp-ev-view-type-builtins.h   \
+       stamp-ev-view-type-builtins.c
 
 ev-view-marshal.h: $(srcdir)/ev-view-marshal.list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@
@@ -89,17 +95,19 @@ ev-view-marshal.c: $(srcdir)/ev-view-marshal.list
 
 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)
+stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_SRC_FILES)
        $(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)
+ev-view-type-builtins.c: stamp-ev-view-type-builtins.c
+       @true
+stamp-ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_SRC_FILES)
        $(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
+       && rm -f xgen-etbc \
+       && echo timestamp > $(@F)
 
 EXTRA_DIST = \
        ev-view-type-builtins.c.template  \
@@ -110,7 +118,7 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview_la_SOURCES))
+EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview3_la_SOURCES))
        $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
        $(G_IR_SCANNER) -v --namespace EvinceView \
        --add-include-path=$(top_builddir)/libdocument \
@@ -119,11 +127,11 @@ EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES) $(filter
        --include=GLib-2.0 \
        --include=GObject-2.0 \
        --include=Gio-2.0 \
-       --include=Gdk-2.0 \
+       --include=Gdk-3.0 \
        --include=GdkPixbuf-2.0 \
-       --include=Gtk-2.0 \
+       --include=Gtk-3.0 \
        --include=EvinceDocument-$(EV_API_VERSION) \
-       --library=evview \
+       --library=evview3 \
        --libtool="$(LIBTOOL)" \
        --output $@ \
        --pkg evince-document-$(EV_API_VERSION) \