X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2FMakefile.am;h=0bf23d04267f76842b15048c9b11d7453fc87bef;hb=2db28e7ad29cc276902da68789e897537ff17912;hp=9da4927878fd7e129237852e5ff9d8b01128a3d9;hpb=dbedc68c9c3390f4f8c749daa85f685923f20e17;p=evince.git

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 9da49278..0bf23d04 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libevview.la
 
 NOINST_H_FILES =			\
+	ev-annotation-window.h		\
 	ev-pixbuf-cache.h		\
 	ev-timeline.h			\
 	ev-transition-animation.h	\
@@ -12,6 +13,7 @@ INST_H_FILES = 				\
 	ev-jobs.h			\
 	ev-job-scheduler.h		\
 	ev-page-cache.h			\
+	ev-stock-icons.h		\
 	ev-view.h			\
 	ev-view-type-builtins.h
 
@@ -19,10 +21,12 @@ headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
 header_DATA = $(INST_H_FILES)
 
 libevview_la_SOURCES = 			\
+	ev-annotation-window.c		\
 	ev-jobs.c			\
 	ev-job-scheduler.c		\
 	ev-page-cache.c			\
 	ev-pixbuf-cache.c		\
+	ev-stock-icons.c		\
 	ev-timeline.c			\
 	ev-transition-animation.c	\
 	ev-view.c			\
@@ -33,7 +37,8 @@ libevview_la_SOURCES = 			\
 	$(INST_H_FILES)
 
 libevview_la_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"EvView\"		\
+	-DDATADIR=\"$(pkgdatadir)\"		\
+	-DG_LOG_DOMAIN=\"EvinceView\"		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	-DEVINCE_COMPILATION			\
 	-I$(top_srcdir)				\
@@ -49,6 +54,7 @@ libevview_la_CFLAGS = \
 
 libevview_la_LDFLAGS = \
 	-version-info $(EV_VIEW_LT_VERSION_INFO)	\
+	-no-undefined	\
 	-export-symbols-regex "^ev_*"	\
 	$(AM_LDFLAGS)
 
@@ -94,36 +100,34 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES)
+EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES)
 	PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
-	$(G_IR_SCANNER) -v --namespace EvView \
-	--add-include-path=$(srcdir) \
-	--add-include-path=. \
-	--add-include-path=$(top_srcdir) \
-	--add-include-path=$(top_builddir) \
+	$(G_IR_SCANNER) -v --namespace EvinceView \
 	--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 = EvView-$(EV_API_VERSION).gir
+gir_DATA = EvinceView-$(EV_API_VERSION).gir
 
 typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = EvView-$(EV_API_VERSION).typelib
+typelibs_DATA = EvinceView-$(EV_API_VERSION).typelib
 
 EXTRA_DIST += $(gir_DATA)
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)