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=49720c9e37af004690184651ff457f19588e5d7d;hb=eaf72960239c45082ac4d8d46f1bfdae0e41a833;hp=e41b3a80668d96b019341da23eb6b504b343f707;hpb=f8f243a0620938f655f7fdf45d73f3a387436462;p=evince.git

diff --git a/libview/Makefile.am b/libview/Makefile.am
index e41b3a80..49720c9e 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,17 +1,6 @@
-INCLUDES=					\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
-	-I$(top_srcdir)/libdocument		\
-	$(LIBVIEW_CFLAGS)			\
-	$(WARN_CFLAGS)				\
-	$(DISABLE_DEPRECATED)
-
 lib_LTLIBRARIES = libevview.la
 
-libevview_la_LDFLAGS = -export-dynamic
-libevview_la_LIBADD = $(LIBVIEW_LIBS)
-
 NOINST_H_FILES =			\
-	ev-job-scheduler.h		\
 	ev-pixbuf-cache.h		\
 	ev-timeline.h			\
 	ev-transition-animation.h	\
@@ -21,11 +10,12 @@ NOINST_H_FILES =			\
 
 INST_H_FILES = 				\
 	ev-jobs.h			\
+	ev-job-scheduler.h		\
 	ev-page-cache.h			\
 	ev-view.h			\
 	ev-view-type-builtins.h
 
-headerdir = $(prefix)/include/evince/@EV_API_VERSION@/ev-view
+headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
 header_DATA = $(INST_H_FILES)
 
 libevview_la_SOURCES = 			\
@@ -42,34 +32,58 @@ libevview_la_SOURCES = 			\
 	$(NOINST_H_FILES)		\
 	$(INST_H_FILES)
 
+libevview_la_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"EvView\"		\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
+	-DEVINCE_COMPILATION			\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/libdocument		\
+	-I$(top_builddir)			\
+	$(AM_CPPFLAGS)
+
+libevview_la_CFLAGS = \
+	$(LIBVIEW_CFLAGS)	\
+	$(WARN_CFLAGS)		\
+	$(DISABLE_DEPRECATED)	\
+	$(AM_CFLAGS)
+
+libevview_la_LDFLAGS = \
+	-version-info $(EV_VIEW_LT_VERSION_INFO)	\
+	-export-symbols-regex "^ev_*"	\
+	$(AM_LDFLAGS)
+
+libevview_la_LIBADD = $(LIBVIEW_LIBS)
+
 BUILT_SOURCES = 			\
 	ev-view-marshal.h		\
 	ev-view-marshal.c		\
 	ev-view-type-builtins.c		\
 	ev-view-type-builtins.h
 
-CLEANFILES = $(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 > $@
+	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --header --internal > $@
 
 ev-view-marshal.c: $(srcdir)/ev-view-marshal.list
-	echo '#include "ev-view-marshal.h"' > ev-view-marshal.c
-	$(GLIB_GENMARSHAL) --prefix=ev_view_marshal $(srcdir)/ev-view-marshal.list --body >> $@
-
-EXTRA_DIST = 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 >> $@
 
 ev-view-type-builtins.h: stamp-ev-view-type-builtins.h
 	@true
 
-stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template ev-job-scheduler.h
+stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_FILES)
 	$(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 ev-job-scheduler.h
+ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_FILES)
 	$(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
 
+EXTRA_DIST = \
+	ev-view-type-builtins.c.template  \
+	ev-view-type-builtins.h.template  \
+	ev-view-marshal.list