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=2b5604ee627aef190d0fcd231c3b49aa974a8b25;hb=d4139205b010ed06310d14284e63114e88ec6de2;hp=3f9ed2a3387b0809ff0380b26b144f251333902b;hpb=3f7764002b149ab5052e1a9a55300bc9c8393062;p=evince.git

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 3f9ed2a3..2b5604ee 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -1,16 +1,17 @@
-lib_LTLIBRARIES = libevdocument.la
+lib_LTLIBRARIES = libevdocument3.la
 
 NOINST_H_FILES =				\
 	ev-debug.h				\
 	ev-module.h
 
-INST_H_FILES = 					\
+INST_H_SRC_FILES = 				\
 	ev-annotation.h				\
 	ev-async-renderer.h			\
 	ev-attachment.h				\
 	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			\
@@ -22,9 +23,8 @@ INST_H_FILES = 					\
 	ev-document-misc.h			\
 	ev-document-print.h			\
 	ev-document-security.h			\
-	ev-document-thumbnails.h		\
 	ev-document-transition.h		\
-	ev-document-type-builtins.h		\
+	ev-document-text.h			\
 	ev-file-exporter.h			\
 	ev-file-helpers.h			\
 	ev-form-field.h				\
@@ -34,17 +34,21 @@ INST_H_FILES = 					\
 	ev-link-action.h			\
 	ev-link-dest.h				\
 	ev-link.h				\
-	ev-mapping.h				\
+	ev-mapping-list.h			\
 	ev-page.h				\
 	ev-render-context.h			\
 	ev-selection.h				\
 	ev-transition-effect.h			\
 	ev-version.h
 
+INST_H_FILES = 					\
+	$(INST_H_SRC_FILES)			\
+	ev-document-type-builtins.h
+
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libdocument
 header_DATA = $(INST_H_FILES)
 
-libevdocument_la_SOURCES=			\
+libevdocument3_la_SOURCES=			\
 	ev-annotation.c				\
 	ev-async-renderer.c			\
 	ev-attachment.c				\
@@ -57,8 +61,8 @@ 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                     \
 	ev-document-layers.c			\
 	ev-document-links.c			\
@@ -69,11 +73,12 @@ libevdocument_la_SOURCES=			\
 	ev-document-transition.c		\
 	ev-document-forms.c			\
 	ev-document-type-builtins.c		\
+	ev-document-text.c			\
 	ev-form-field.c 			\
 	ev-debug.c				\
 	ev-file-exporter.c			\
 	ev-file-helpers.c			\
-	ev-mapping.c				\
+	ev-mapping-list.c			\
 	ev-module.c				\
 	ev-page.c				\
 	ev-render-context.c			\
@@ -83,7 +88,7 @@ libevdocument_la_SOURCES=			\
 	$(NOINST_H_FILES)			\
 	$(INST_H_FILES)
 
-libevdocument_la_CPPFLAGS = \
+libevdocument3_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"EvinceDocument\"		\
 	-DEVINCE_UIDIR=\"$(pkgdatadir)\"		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
@@ -92,39 +97,48 @@ libevdocument_la_CPPFLAGS = \
 	-DEVINCE_COMPILATION				\
 	$(AM_CPPFLAGS)
 
-libevdocument_la_CFLAGS = \
-	$(LIBDOCUMENT_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(DISABLE_DEPRECATED)	\
+libevdocument3_la_CFLAGS = \
+	$(LIBDOCUMENT_CFLAGS)			\
+	-I$(top_srcdir)/cut-n-paste/synctex	\
+	$(WARN_CFLAGS)				\
+	$(DISABLE_DEPRECATED)			\
 	$(AM_CFLAGS)
 
-libevdocument_la_LDFLAGS = \
+libevdocument3_la_LDFLAGS = \
 	-version-info $(EV_DOCUMENT_LT_VERSION_INFO)	\
 	-no-undefined	\
 	-export-symbols-regex "^ev_*"	\
 	$(AM_LDFLAGS)
 
-libevdocument_la_LIBADD = $(LIBDOCUMENT_LIBS)
+libevdocument3_la_LIBADD = \
+	$(LIBDOCUMENT_LIBS)	\
+	$(top_builddir)/cut-n-paste/synctex/libsynctex.la
+
 
 BUILT_SOURCES = 			\
 	ev-document-type-builtins.c	\
 	ev-document-type-builtins.h
 
-CLEANFILES = $(BUILT_SOURCES) stamp-ev-document-type-builtins.h
+CLEANFILES = 					\
+	$(BUILT_SOURCES)			\
+	stamp-ev-document-type-builtins.h	\
+	stamp-ev-document-type-builtins.c
 
 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)
+stamp-ev-document-type-builtins.h: ev-document-type-builtins.h.template $(INST_H_SRC_FILES)
 	$(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)
+ev-document-type-builtins.c: stamp-ev-document-type-builtins.c
+	@true
+stamp-ev-document-type-builtins.c: ev-document-type-builtins.c.template $(INST_H_SRC_FILES)
 	$(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
+	&& rm -f xgen-etbc \
+	&& echo timestamp > $(@F)
 
 EXTRA_DIST = \
 	ev-document-type-builtins.c.template \
@@ -134,18 +148,18 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
+EvinceDocument-$(EV_API_VERSION).gir: libevdocument3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument3_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) \
 	--include=GLib-2.0 \
 	--include=Gio-2.0 \
-	--include=Gdk-2.0 \
+	--include=Gdk-3.0 \
 	--include=GdkPixbuf-2.0 \
-	--include=Gtk-2.0 \
-	--library=evdocument \
-	--libtool="$(SHAVE_SAVED_LIBTOOL)" \
+	--include=Gtk-3.0 \
+	--library=evdocument3 \
+	--libtool="$(SAVED_LIBTOOL)" \
 	--output $@ \
 	--pkg evince-document-$(EV_API_VERSION) \
 	-I$(top_srcdir) \
@@ -153,7 +167,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
@@ -172,3 +187,5 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 	$< -o $@
 
 endif # ENABLE_INTROSPECTION
+
+-include $(top_srcdir)/git.mk