X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2FMakefile.am;h=cfebfdf04e2d72732e2c9a009f40de0ccdecad86;hb=1c57f46721837926785742850714d341c904d0f4;hp=279065282645f901369ee00bdabd9c7f1923fe9d;hpb=d5f6bff1a13c848afbd74dd2e82c78bbdead54d2;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 27906528..cfebfdf0 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES =							\
 	-I$(top_srcdir)/ltk					\
 	-DDATADIR=\""$(datadir)"\"            			\
         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	$(EXTRA_GNOME_CFLAGS)			\
+	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\"			\
+	$(EXTRA_GNOME_CFLAGS)					\
 	$(libpaper_CFLAGS)
 
 if WITH_GNOME
@@ -103,13 +104,12 @@ gnome_pdf_viewer_SOURCES =		\
 	$(common_sources)		\
 	BonoboStream.h			\
 	BonoboStream.cc			\
-	GOutputDev.cc			\
-	GOutputDev.h			\
 	GPOutputDev.cc			\
 	GPOutputDev.h			\
 	bonobo-application-x-pdf.cc	\
 	gpdf-control.cc			\
 	gpdf-control.h			\
+	gpdf-g-switch.h			\
 	gpdf-persist-stream.cc		\
 	gpdf-persist-stream.h		\
 	gpdf-util.h			\
@@ -117,12 +117,22 @@ gnome_pdf_viewer_SOURCES =		\
 	gpdf-view.h			\
 	gtkgesture.c			\
 	gtkgesture.h			\
-	pdf-view.cc			\
-	pdf-view.h
+	page-control.c			\
+	page-control.h
+
+# Font embedding hack for Gnome Print < 2.1.?2?
+#	gpdf-gnome-font.c		\
+#	gpdf-gnome-font.h		\
+
+# Old files
+#	GOutputDev.cc			\
+#	GOutputDev.h			\
+#	pdf-view.cc			\
+#	pdf-view.h			\
 # 	gpdf-embeddable.cc		\
 # 	gpdf-embeddable.h		\
 # 	gpdf-embeddable-view.cc		\
-# 	gpdf-embeddable-view.h		\
+# 	gpdf-embeddable-view.h
 
 gnome_pdf_viewer_LDADD =		\
 	$(top_builddir)/goo/libgoo.a	\
@@ -199,7 +209,7 @@ xpdf-ltk.h: xpdf.ltk
 
 
 stockdir = $(datadir)/pixmaps/gpdf
-stock_DATA = stock-zoom-fit-wide.xpm
+stock_DATA = fitwidth.png
 
 ltk = 			\
 	xpdf-flip.ltk	\
@@ -220,6 +230,5 @@ ui_DATA =				\
 	bonobo-application-x-pdf-ui.xml \
 	gpdf-control-ui.xml
 
-
 EXTRA_DIST = $(stock_DATA) $(ltk)	\
              $(server_in_files) config.h $(ui_DATA)