X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2FMakefile.am;h=ab814817663876569e2a99b8aa5d94429560fd14;hb=1f7e03f2861f4b8d2bb75bd220754b7a89b7847e;hp=9074ebc302bbbba28abf80dbee3840f801649589;hpb=c3d1dd25dcf509be82a92c5aeb544f08a5a604f4;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 9074ebc3..ab814817 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,169 +1,126 @@
-INCLUDES =					\
-	-I$(top_srcdir)/goo			\
-	-I$(top_srcdir)/ltk			\
-	$(EXTRA_GLIB_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)
-
-if WITH_GNOME
-gui = gpdf
-else
-gui = xpdf
-endif
-
-bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui) bonobo-application-x-pdf
-
-common_sources =		\
+INCLUDES =							\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/backend					\
+	-I$(top_srcdir)/pdf					\
+	-I$(top_srcdir)/pdf/goo					\
+	-I$(top_srcdir)/pdf/fofi				\
+	-I$(top_srcdir)/pdf/splash				\
+	$(GTK_CFLAGS)						\
+	-DDATADIR=\""$(datadir)"\"
+
+noinst_PROGRAMS = test-gdk-output-dev
+
+noinst_LTLIBRARIES = libxpdf.la libpdfdocument.la
+
+libxpdf_la_SOURCES =		\
+	Annot.cc		\
+	Annot.h			\
 	Array.cc 		\
 	Array.h			\
 	BaseFile.h		\
+	BuiltinFont.cc		\
+	BuiltinFont.h		\
+	BuiltinFontTables.cc	\
+	BuiltinFontTables.h	\
 	Catalog.cc 		\
 	Catalog.h		\
-	CompactFontInfo.h	\
+	CharCodeToUnicode.cc	\
+	CharCodeToUnicode.h	\
+	CMap.cc			\
+	CMap.h			\
+	Decrypt.cc		\
+	Decrypt.h		\
 	Dict.cc 		\
 	Dict.h			\
 	Error.cc 		\
 	Error.h			\
-	FontEncoding.cc		\
-	FontEncoding.h		\
-	FontFile.cc		\
-	FontFile.h		\
-	FontInfo.h		\
+	FontEncodingTables.cc	\
+	FontEncodingTables.h	\
+	Function.cc		\
+	Function.h		\
 	Gfx.cc 			\
 	Gfx.h			\
 	GfxFont.cc 		\
 	GfxFont.h		\
 	GfxState.cc		\
 	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	\
 	Object.cc 		\
 	Object.h		\
+	Outline.cc		\
+	Outline.h		\
 	OutputDev.cc 		\
 	OutputDev.h		\
 	Page.cc 		\
 	Page.h			\
-	Params.cc 		\
-	Params.h		\
 	Parser.cc 		\
 	Parser.h		\
 	PDFDoc.cc 		\
 	PDFDoc.h		\
-	StdFontInfo.h		\
+	PDFDocEncoding.cc	\
+	PDFDocEncoding.h	\
+	PSTokenizer.cc		\
+	PSTokenizer.h		\
+	SplashOutputDev.cc      \
+	SplashOutputDev.h       \
+	Stream-CCITT.h		\
 	Stream.cc 		\
 	Stream.h		\
-	Stream-CCITT.h		\
-	TextOutputDev.h		\
-	TextOutputFontInfo.h	\
-	TextOutputDev.cc	\
+	UnicodeMap.cc		\
+	UnicodeMap.h		\
+	UnicodeMapTables.h	\
+	UnicodeTypeTable.cc	\
+	UnicodeTypeTable.h	\
 	XRef.cc			\
-	XRef.h
-
-gpdf_CFLAGS = 			\
-	-DBONOBO_IO
-
-gpdf_SOURCES = 			\
-	gpdf.cc
-
-gpdf_LDADD =			\
-	$(GTK_LIBS)		\
-	$(GNOME_LIBDIR)		\
-	-lbonobo		\
-	$(GNOMEGNORBA_LIBS)	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(INTLLIBS)
-
-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	\
-	gtkgesture.c			\
-	gtkgesture.h
-
-bonobo_application_x_pdf_LDADD =	\
-	../goo/libgoo.a			\
-	$(GTK_LIBS)			\
-	$(GNOME_LIBDIR)			\
-	-lbonobo			\
-	$(GNOMEGNORBA_LIBS)		\
-	$(EXTRA_GLIB_LIBS)		\
-	$(INTLLIBS)
-
-xpdf_SOURCES =			\
-	$(common_sources)	\
-	XOutputDev.cc		\
-	LTKOutputDev.cc		\
+	XRef.h			\
+				\
+	CharTypes.h		\
+	CompactFontTables.h	\
+	ErrorCodes.h		\
+	NameToUnicodeTable.h	\
+	GDKSplashOutputDev.cc   \
+	GDKSplashOutputDev.h    \
 	PSOutputDev.cc		\
 	PSOutputDev.h		\
-	xpdf.cc
-
-xpdf_CFLAGS = $(X_CFLAGS)
-xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) 
-
-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)
+	TextOutputDev.cc	\
+	TextOutputDev.h		\
+	UTF8.h
 
-xpdf-ltk.h: xpdf.ltk
-	rm -f $@
-	$(top_srcdir)/ltk/ltkbuild <xpdf.ltk >$@.new
-	mv $@.new $@
+# The sources at the end are put in libxpdf.a for convenience here, but are 
+# conceptually part of the apps not part of the libs.
 
-bitmaps =			\
-	about.xbm		\
-	dblLeftArrow.xbm	\
-	dblRightArrow.xbm	\
-	find.xbm		\
-	leftArrow.xbm		\
-	postscript.xbm		\
-	rightArrow.xbm		\
-	xpdfIcon.xpm		\
-	zoomIn.xbm		\
-	zoomOut.xbm		
+test_gdk_output_dev_SOURCES =          \
+       test-gdk-output-dev.cc
 
-ltk = 			\
-	xpdf-flip.ltk	\
-	xpdf-top.ltk	\
-	xpdf.ltk
+test_gdk_output_dev_LDADD =                                   	\
+	libxpdf.la                                              \
+	$(top_builddir)/pdf/goo/libGoo.la                       \
+	$(top_builddir)/pdf/fofi/libfofi.la                     \
+	$(top_builddir)/pdf/splash/libsplash.la                 \
+	$(GTK_LIBS)
 
-gnorbadir = $(sysconfdir)/CORBA/servers
-gnorba_DATA = application-x-pdf.gnorba
+libpdfdocument_la_SOURCES =	\
+	pdf-document.cc		\
+	pdf-document.h
 
-EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(gnorba_DATA) config.h
+libpdfdocument_la_LIBADD =                                    	\
+	libxpdf.la                                             	\
+	$(top_builddir)/backend/libevbackend.la			\
+	$(top_builddir)/pdf/goo/libGoo.la                       \
+	$(top_builddir)/pdf/fofi/libfofi.la                     \
+	$(top_builddir)/pdf/splash/libsplash.la
 
+EXTRA_DIST = config.h