X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2FMakefile.am;h=5d931401247f3d266751f6cb543c72e793a11fae;hb=179af30116fcee661c68d64885f4a6fe6c0cd679;hp=549810ef8f2944dda1371e91e23657d8306a80ff;hpb=4b00949a4ac2bb998bc636338709a3a16e30de57;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 549810ef..5d931401 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,26 +1,17 @@
+INCLUDES =							\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/pdf					\
+	-I$(top_srcdir)/pdf/goo					\
+	-I$(top_srcdir)/pdf/fofi				\
+	-I$(top_srcdir)/pdf/splash				\
+	$(GTK_CFLAGS)						\
+	-DDATADIR=\""$(datadir)"\"
 
-INCLUDES =					\
-	-I$(top_srcdir)/goo			\
-	-I$(top_srcdir)/ltk			\
-	-DDATADIR=\""$(datadir)"\"            	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EXTRA_GLIB_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(libpaper_CFLAGS)
+noinst_PROGRAMS = test-gdk-output-dev
 
-if WITH_GNOME
-gui =
-else
-gui = xpdf
-endif
+noinst_LIBRARIES = libxpdf.a
 
-bin_PROGRAMS = 	$(gui)	bonobo-application-x-pdf
-#	pdftops pdftotext	
-#	pdfinfo	pdftopbm	
-#	pdfimages  		
-
-
-common_sources =		\
+libxpdf_a_SOURCES =		\
 	Annot.cc		\
 	Annot.h			\
 	Array.cc 		\
@@ -30,28 +21,20 @@ common_sources =		\
 	BuiltinFont.h		\
 	BuiltinFontTables.cc	\
 	BuiltinFontTables.h	\
-	CMap.cc			\
-	CMap.h			\
 	Catalog.cc 		\
 	Catalog.h		\
 	CharCodeToUnicode.cc	\
 	CharCodeToUnicode.h	\
-	CharTypes.h		\
-	CompactFontTables.h	\
+	CMap.cc			\
+	CMap.h			\
 	Decrypt.cc		\
 	Decrypt.h		\
 	Dict.cc 		\
 	Dict.h			\
-	DisplayFontTable.h	\
 	Error.cc 		\
 	Error.h			\
-	ErrorCodes.h		\
-	FTFont.cc		\
-	FTFont.h		\
 	FontEncodingTables.cc	\
 	FontEncodingTables.h	\
-	FontFile.cc		\
-	FontFile.h		\
 	Function.cc		\
 	Function.h		\
 	Gfx.cc 			\
@@ -62,157 +45,67 @@ common_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 		\
 	Link.h			\
 	NameToCharCode.cc	\
 	NameToCharCode.h	\
-	NameToUnicodeTable.h	\
 	Object.cc 		\
 	Object.h		\
+	Outline.cc		\
+	Outline.h		\
 	OutputDev.cc 		\
 	OutputDev.h		\
-	PDFDoc.cc 		\
-	PDFDoc.h		\
-	PSTokenizer.cc		\
-	PSTokenizer.h		\
 	Page.cc 		\
 	Page.h			\
 	Parser.cc 		\
 	Parser.h		\
-	SFont.cc		\
-	SFont.h			\
+	PDFDoc.cc 		\
+	PDFDoc.h		\
+	PDFDocEncoding.cc	\
+	PDFDocEncoding.h	\
+	PSTokenizer.cc		\
+	PSTokenizer.h		\
 	Stream-CCITT.h		\
 	Stream.cc 		\
 	Stream.h		\
-	T1Font.cc		\
-	T1Font.h		\
-	TTFont.cc		\
-	TTFont.h		\
-	TextOutputDev.cc	\
-	TextOutputDev.h		\
-	UTF8.h			\
 	UnicodeMap.cc		\
 	UnicodeMap.h		\
 	UnicodeMapTables.h	\
+	UnicodeTypeTable.cc	\
+	UnicodeTypeTable.h	\
 	XRef.cc			\
 	XRef.h
 
-bonobo_application_x_pdf_SOURCES =	\
-	$(common_sources)		\
-	BonoboStream.h			\
-	BonoboStream.cc			\
-	GOutputDev.cc			\
-	GOutputDev.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-persist-stream.cc		\
-	gpdf-persist-stream.h		\
-	gpdf-util.h			\
-	gtkgesture.c			\
-	gtkgesture.h			\
-	pdf-view.cc			\
-	pdf-view.h
-
-bonobo_application_x_pdf_LDADD =	\
-	../goo/libgoo.a			\
-	$(GTK_LIBS)			\
-	$(GNOME_LIBDIR)			\
-	$(EXTRA_GNOME_LIBS)		\
-	$(EXTRA_GLIB_LIBS)		\
-	$(INTLLIBS)			\
-	$(libpaper_LIBS)
-
-xpdf_SOURCES =			\
-	$(common_sources)	\
-	XOutputDev.cc		\
-	LTKOutputDev.cc		\
-	PSOutputDev.cc		\
-	PSOutputDev.h		\
-	xpdf.cc
-
-xpdf_CFLAGS = $(X_CFLAGS)
-xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) $(libpaper_CFLAGS)
-
-#pdfimages_SOURCES =		
-#	$(common_sources)	
-#	ImageOutputDev.cc	
-#	ImageOutputDev.h	
-#	pdfimages.cc
-
-#pdfimages_LDADD = ../goo/libgoo.a
-#
-#pdftops_SOURCES =		
-#	$(common_sources)	
-#	PSOutputDev.cc		
-#       pdftops.cc
-#pdftops_LDADD = ../goo/libgoo.a
-
-#pdftotext_SOURCES =		
-#	$(common_sources)	
-#	pdftotext.cc
-#pdftotext_LDADD = ../goo/libgoo.a
-
-#pdfinfo_SOURCES =		
-#	$(common_sources)	
-#	pdfinfo.cc
-#pdfinfo_LDADD = ../goo/libgoo.a
-
-#pdftopbm_SOURCES =		
-#	$(common_sources)	
-#	PBMOutputDev.cc		
-#	PBMOutputDev.h		
-#	XOutputDev.cc		
-#	XOutputDev.h		
-#	XOutputFontInfo.h	
-#	pdftopbm.cc
-
-#pdftopbm_LDADD = ../goo/libgoo.a $(EXTRA_GNOME_LIBS)
-
-xpdf-ltk.h: xpdf.ltk
-	rm -f $@
-	$(top_srcdir)/ltk/ltkbuild <xpdf.ltk >$@.new
-	mv $@.new $@
-
-#bitmaps =		
-#	about.xbm		
-#	dblLeftArrow.xbm	
-#	dblRightArrow.xbm	
-#	find.xbm		
-#	leftArrow.xbm		
-#	postscript.xbm		
-#	rightArrow.xbm		
-#	xpdfIcon.xpm		
-#	zoomIn.xbm		
-#	zoomOut.xbm		
-
-
-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	
-
-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
-
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
-
-EXTRA_DIST = $(stock_DATA) ChangeLog $(ltk)	\
-             $(oaf_DATA) config.h $(XML_FILES)
-
-
+common_sources =		\
+	CharTypes.h		\
+	CompactFontTables.h	\
+	ErrorCodes.h		\
+	NameToUnicodeTable.h	\
+	TextOutputDev.cc	\
+	TextOutputDev.h		\
+	UTF8.h
+
+test_gdk_output_dev_SOURCES =          \
+       GDKSplashOutputDev.cc           \
+       GDKSplashOutputDev.h            \
+       SplashOutputDev.cc              \
+       SplashOutputDev.h               \
+       $(common_sources)               \
+       test-gdk-output-dev.cc
+
+test_gdk_output_dev_LDADD = 					\
+        libxpdf.a                                               \
+        $(top_builddir)/pdf/goo/libGoo.a                        \
+        $(top_builddir)/pdf/fofi/libfofi.a                      \
+	$(top_builddir)/pdf/splash/libsplash.a			\
+	$(GTK_LIBS)
+
+EXTRA_DIST = config.h