X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2FMakefile.am;h=db62813e6bad77646d0ca67b787d57556f12d940;hb=9e920bcf5162b7f187cd3ed5026baa2bd155631c;hp=acaa4df9f8767fa3c63d346a824ddf8d620927c3;hpb=6d5e1a35538369b07d51c5a89a5b3c0788f4aacd;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index acaa4df9..db62813e 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -4,13 +4,14 @@ INCLUDES =							\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/goo					\
 	-I$(top_srcdir)/lib/ggv-sidebar				\
+	-I$(top_srcdir)/fofi					\
+	-I$(top_srcdir)/splash					\
 	-DDATADIR=\""$(datadir)"\"            			\
         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\"			\
 	$(EXTRA_GNOME_CFLAGS)					\
 	$(GNOME_PRINT_PRIVATE_CFLAGS)				\
 	$(GPDF_DEPRECATED_CFLAGS)				\
-	$(WARN_CFLAGS)						\
 	$(libpaper_CFLAGS)
 
 if WITH_GNOME
@@ -56,8 +57,6 @@ libxpdf_a_SOURCES =		\
 	Error.h			\
 	FontEncodingTables.cc	\
 	FontEncodingTables.h	\
-	FontFile.cc		\
-	FontFile.h		\
 	Function.cc		\
 	Function.h		\
 	Gfx.cc 			\
@@ -68,8 +67,12 @@ libxpdf_a_SOURCES =		\
 	GfxState.h		\
 	GlobalParams.cc		\
 	GlobalParams.h		\
+	JArithmeticDecoder.cc	\
+	JArithmeticDecoder.h	\
 	JBIG2Stream.cc		\
 	JBIG2Stream.h		\
+	JPXStream.cc		\
+	JPXStream.h		\
 	Lexer.cc 		\
 	Lexer.h			\
 	Link.cc 		\
@@ -98,33 +101,26 @@ libxpdf_a_SOURCES =		\
 	UnicodeMap.cc		\
 	UnicodeMap.h		\
 	UnicodeMapTables.h	\
+	UnicodeTypeTable.cc	\
+	UnicodeTypeTable.h	\
 	XRef.cc			\
 	XRef.h
 
 common_sources =		\
 	CharTypes.h		\
 	CompactFontTables.h	\
-	DisplayFontTable.h	\
 	ErrorCodes.h		\
-	FTFont.cc		\
-	FTFont.h		\
 	NameToUnicodeTable.h	\
-	SFont.cc		\
-	SFont.h			\
-	T1Font.cc		\
-	T1Font.h		\
-	TTFont.cc		\
-	TTFont.h		\
 	TextOutputDev.cc	\
 	TextOutputDev.h		\
 	UTF8.h
 
+ANNOTS_VIEW_SRCS =
+
 if USE_ANNOTS_VIEW
-  ANNOTS_VIEW_SRCS = 			\
+  ANNOTS_VIEW_SRCS += 			\
 	gpdf-annots-view.cc		\
 	gpdf-annots-view.h
-else
-  ANNOTS_VIEW_SRCS =
 endif
 
 libgpdf_a_SOURCES =			\
@@ -200,12 +196,15 @@ gnome_pdf_viewer_LDADD =					\
 	libxpdf.a						\
 	libgpdf.a						\
 	$(top_builddir)/goo/libGoo.a				\
+	$(top_builddir)/fofi/libfofi.a				\
 	$(top_builddir)/lib/ggv-sidebar/libggv-sidebar.a	\
 	$(EXTRA_GNOME_LIBS)					\
 	$(libpaper_LIBS)
 
 xpdf_SOURCES =			\
 	$(common_sources)	\
+	SplashOutputDev.cc	\
+	SplashOutputDev.h	\
 	XPDFApp.cc		\
 	XPDFApp.h		\
 	XPDFCore.cc		\
@@ -214,10 +213,8 @@ xpdf_SOURCES =			\
 	XPDFTree.h		\
 	XPDFViewer.cc		\
 	XPDFViewer.h		\
-	XOutputDev.cc		\
-	XOutputDev.h		\
-	XPixmapOutputDev.cc	\
-	XPixmapOutputDev.h	\
+	XSplashOutputDev.cc	\
+	XSplashOutputDev.h	\
 	PSOutputDev.cc		\
 	PSOutputDev.h		\
 	xpdf.cc
@@ -254,16 +251,14 @@ xpdf_LDADD = 				\
 #	pdfinfo.cc
 #pdfinfo_LDADD = ../goo/libGoo.a
 
-#pdftopbm_SOURCES =		
+#pdftopüm_SOURCES =		
 #	$(common_sources)	
-#	PBMOutputDev.cc		
-#	PBMOutputDev.h		
 #	XOutputDev.cc		
 #	XOutputDev.h		
 #	XOutputFontInfo.h	
 #	pdftopbm.cc
 
-#pdftopbm_LDADD = ../goo/libGoo.a $(EXTRA_GNOME_LIBS)
+#pdftoppm_LDADD = ../goo/libGoo.a $(EXTRA_GNOME_LIBS)
 
 #bitmaps =		
 #	about.xbm		
@@ -292,8 +287,10 @@ dist-hook:
 	    rm -f $(distdir)/$$file ; \
 	done
 
+STOCK_ANNOTS_ICONS = 
+
 if USE_ANNOTS_VIEW
-  STOCK_ANNOTS_ICONS = 			\
+  STOCK_ANNOTS_ICONS += 			\
 	stock-annot-circle.png		\
 	stock-annot-fileattachment.png	\
 	stock-annot-freetext.png	\
@@ -312,8 +309,6 @@ if USE_ANNOTS_VIEW
 	stock-annot-underline.png	\
 	stock-annot-widget.png		\
 	stock-annot-unknown.png
-else
-  STOCK_ANNOTS_ICONS =
 endif
 
 stockdir = $(datadir)/pixmaps/gpdf
@@ -349,9 +344,36 @@ CLEANFILES =				\
 	$(server_in_files:.server.in.in=.server.in) \
 	$(marshal_sources)
 
-EXTRA_DIST = $(stock_DATA)		\
+if USE_ANNOTS_VIEW
+  EXTRA_DIST = $(stock_DATA)		\
 	gpdf-marshal.list		\
 	$(server_in_files) 		\
 	config.h 			\
 	$(ui_DATA)			\
 	$(glade_DATA)
+else
+  EXTRA_DIST = $(stock_DATA)		\
+	gpdf-marshal.list		\
+	$(server_in_files) 		\
+	config.h 			\
+	$(ui_DATA)			\
+	$(glade_DATA)			\
+	stock-annot-circle.png		\
+	stock-annot-fileattachment.png	\
+	stock-annot-freetext.png	\
+	stock-annot-highlight.png	\
+	stock-annot-ink.png		\
+	stock-annot-line.png		\
+	stock-annot-link.png		\
+	stock-annot-movie.png		\
+	stock-annot-popup.png		\
+	stock-annot-sound.png		\
+	stock-annot-square.png		\
+	stock-annot-stamp.png		\
+	stock-annot-strikeout.png	\
+	stock-annot-text.png		\
+	stock-annot-trapnet.png		\
+	stock-annot-underline.png	\
+	stock-annot-widget.png		\
+	stock-annot-unknown.png
+endif