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

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 9da49278..bb563a4e 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,6 +1,9 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
 lib_LTLIBRARIES = libevview.la
 
 NOINST_H_FILES =			\
+	ev-annotation-window.h		\
 	ev-pixbuf-cache.h		\
 	ev-timeline.h			\
 	ev-transition-animation.h	\
@@ -12,6 +15,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 +23,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 +39,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 +56,7 @@ libevview_la_CFLAGS = \
 
 libevview_la_LDFLAGS = \
 	-version-info $(EV_VIEW_LT_VERSION_INFO)	\
+	-no-undefined	\
 	-export-symbols-regex "^ev_*"	\
 	$(AM_LDFLAGS)
 
@@ -65,23 +73,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 > $@
+	$(QUIET_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
+	$(QUIET_GEN)echo '#include <config.h>' > ev-view-marshal.c
 	$(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 \
+	$(QUIET_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 \
+	$(QUIET_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
 
@@ -94,9 +102,9 @@ 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 \
+	$(G_IR_SCANNER) -v --namespace EvinceView \
 	--add-include-path=$(srcdir) \
 	--add-include-path=. \
 	--add-include-path=$(top_srcdir) \
@@ -120,10 +128,10 @@ EvView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES)
 	$(INST_H_FILES)
 
 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)