X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pdf%2Fxpdf%2FMakefile.am;h=98b90839d84f13485c753ccd42c9955dec70cbba;hb=6badfcc114d83927dab777c1a3be60de06320045;hp=961ded39ecf0192f62353f6e3edf4b11257cf894;hpb=575be840f47add96d3a341708bdc475c32d5f262;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 961ded39..98b90839 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,24 +1,24 @@
 
-INCLUDES =					\
-	-I$(top_srcdir)/goo			\
-	-I$(top_srcdir)/ltk			\
-	-DDATADIR=\""$(datadir)"\"            	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EXTRA_GLIB_CFLAGS)			\
+INCLUDES =							\
+	-I$(top_srcdir)/goo					\
+	-I$(top_srcdir)/ltk					\
+	-DDATADIR=\""$(datadir)"\"            			\
+        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	$(EXTRA_GNOME_CFLAGS)			\
 	$(libpaper_CFLAGS)
 
 if WITH_GNOME
-gui = gpdf
+gui =
 else
 gui = xpdf
 endif
 
-bin_PROGRAMS = 	$(gui)	bonobo-application-x-pdf
+bin_PROGRAMS = 	$(gui)
 #	pdftops pdftotext	
 #	pdfinfo	pdftopbm	
 #	pdfimages  		
 
+libexec_PROGRAMS = gnome-pdf-viewer
 
 common_sources =		\
 	Annot.cc		\
@@ -99,43 +99,35 @@ common_sources =		\
 	XRef.cc			\
 	XRef.h
 
-gpdf_CFLAGS = 			\
-	-DBONOBO_IO
-
-gpdf_SOURCES = 			\
-	gpdf.cc
-
-gpdf_LDADD =			\
-	$(GTK_LIBS)		\
-	$(GNOME_LIBDIR)		\
-	$(EXTRA_GNOME_LIBS)	\
-	$(INTLLIBS)
-
-bonobo_application_x_pdf_SOURCES =	\
+gnome_pdf_viewer_SOURCES =		\
 	$(common_sources)		\
 	BonoboStream.h			\
 	BonoboStream.cc			\
 	GOutputDev.cc			\
 	GOutputDev.h			\
+	GPOutputDev.cc			\
+	GPOutputDev.h			\
 	bonobo-application-x-pdf.cc	\
-	bonobo-application-x-pdf.h	\
-	gpdf-embeddable.cc		\
-	gpdf-embeddable.h		\
-	gpdf-embeddable-view.cc		\
-	gpdf-embeddable-view.h		\
+	gpdf-control.cc			\
+	gpdf-control.h			\
+	gpdf-g-switch.h			\
+	gpdf-persist-stream.cc		\
+	gpdf-persist-stream.h		\
 	gpdf-util.h			\
+	gpdf-view.cc			\
+	gpdf-view.h			\
 	gtkgesture.c			\
 	gtkgesture.h			\
 	pdf-view.cc			\
 	pdf-view.h
+# 	gpdf-embeddable.cc		\
+# 	gpdf-embeddable.h		\
+# 	gpdf-embeddable-view.cc		\
+# 	gpdf-embeddable-view.h		\
 
-bonobo_application_x_pdf_LDADD =	\
-	../goo/libgoo.a			\
-	$(GTK_LIBS)			\
-	$(GNOME_LIBDIR)			\
+gnome_pdf_viewer_LDADD =		\
+	$(top_builddir)/goo/libgoo.a	\
 	$(EXTRA_GNOME_LIBS)		\
-	$(EXTRA_GLIB_LIBS)		\
-	$(INTLLIBS)			\
 	$(libpaper_LIBS)
 
 xpdf_SOURCES =			\
@@ -147,7 +139,12 @@ xpdf_SOURCES =			\
 	xpdf.cc
 
 xpdf_CFLAGS = $(X_CFLAGS)
-xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) $(libpaper_CFLAGS)
+xpdf_LDADD = 				\
+	$(top_builddir)/goo/libgoo.a 	\
+	$(top_builddir)/ltk/libltk.a    \
+	-lXpm                           \
+	$(EXTRA_GNOME_LIBS) 		\
+	$(libpaper_LIBS)
 
 #pdfimages_SOURCES =		
 #	$(common_sources)	
@@ -203,26 +200,27 @@ xpdf-ltk.h: xpdf.ltk
 
 
 stockdir = $(datadir)/pixmaps/gpdf
-stock_DATA = stock-zoom-in.xpm	stock-zoom-out.xpm \
-	     stock-zoom-fit.xpm stock-zoom-fit-wide.xpm	\
-	     stock-zoom-fit-tall.xpm	
+stock_DATA = stock-zoom-fit-wide.xpm
 
 ltk = 			\
 	xpdf-flip.ltk	\
 	xpdf-top.ltk	\
 	xpdf.ltk
 
-oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_XPDF.oafinfo
 
-XML_FILES =				\
-	gpdf-ui.xml			\
-	bonobo-application-x-pdf-ui.xml
+server_in_files = GNOME_PDF.server.in.in
 
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
+serverdir = $(libdir)/bonobo/servers
+server_DATA = $(server_in_files:.server.in.in=.server)
+$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+@INTLTOOL_SERVER_RULE@
 
-EXTRA_DIST = $(stock_DATA) ChangeLog $(ltk)	\
-             $(oaf_DATA) config.h $(XML_FILES)
+uidir = $(datadir)/gnome-2.0/ui
+ui_DATA =				\
+	bonobo-application-x-pdf-ui.xml \
+	gpdf-control-ui.xml
 
 
+EXTRA_DIST = $(stock_DATA) $(ltk)	\
+             $(server_in_files) config.h $(ui_DATA)