X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2FMakefile.am;h=96d57ec267e41302962764bd283c0007a53e8f37;hb=ad63666daeeda50acc7630132d61fe044634fddd;hp=77480647f3e70a52336a423a658490c76ad0e8a0;hpb=68a5fcc577162e9c96d18a443c98118a600218df;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 77480647..96d57ec2 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,141 +1,384 @@
+SUBDIRS = . tests
 
-INCLUDES =	\
-	-I$(top_srcdir)/goo	\
-	-I$(top_srcdir)/ltk	\
-	-DGPDF_GLADE_DIR=\""$(gladedir)"\"	\
-	$(EXTRA_GNOME_CFLAGS)
+INCLUDES =							\
+	-I$(top_srcdir)						\
+	-I$(top_srcdir)/goo					\
+	-I$(top_srcdir)/lib/ggv-sidebar				\
+	-DDATADIR=\""$(datadir)"\"            			\
+        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\"			\
+	$(EXTRA_GNOME_CFLAGS)					\
+	$(GNOME_PRINT_PRIVATE_CFLAGS)				\
+	$(GPDF_DEPRECATED_CFLAGS)				\
+	$(libpaper_CFLAGS)
 
 if WITH_GNOME
-gui = gpdf
+gui =
 else
 gui = xpdf
 endif
 
-#bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui) bonobo-image-x-pdf
-bin_PROGRAMS = bonobo-image-x-pdf
+marshal_sources =			\
+	gpdf-marshal.c			\
+	gpdf-marshal.h	
 
-common_sources =		\
+bin_PROGRAMS = 	$(gui)
+#	pdftops pdftotext	
+#	pdfinfo	pdftopbm	
+#	pdfimages  		
+
+libexec_PROGRAMS = gnome-pdf-viewer
+
+noinst_LIBRARIES = libxpdf.a libgpdf.a
+
+libxpdf_a_SOURCES =		\
+	Annot.cc		\
+	Annot.h			\
 	Array.cc 		\
+	Array.h			\
 	BaseFile.h		\
+	BuiltinFont.cc		\
+	BuiltinFont.h		\
+	BuiltinFontTables.cc	\
+	BuiltinFontTables.h	\
 	Catalog.cc 		\
+	Catalog.h		\
+	CharCodeToUnicode.cc	\
+	CharCodeToUnicode.h	\
+	CMap.cc			\
+	CMap.h			\
+	Decrypt.cc		\
+	Decrypt.h		\
 	Dict.cc 		\
+	Dict.h			\
 	Error.cc 		\
-	FontEncoding.cc		\
-	FontEncoding.h		\
+	Error.h			\
+	FontEncodingTables.cc	\
+	FontEncodingTables.h	\
 	FontFile.cc		\
 	FontFile.h		\
-	FontInfo.h		\
+	Function.cc		\
+	Function.h		\
 	Gfx.cc 			\
+	Gfx.h			\
 	GfxFont.cc 		\
+	GfxFont.h		\
 	GfxState.cc		\
+	GfxState.h		\
+	GlobalParams.cc		\
+	GlobalParams.h		\
+	JBIG2Stream.cc		\
+	JBIG2Stream.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 		\
-	Params.cc 		\
+	Page.h			\
 	Parser.cc 		\
+	Parser.h		\
 	PDFDoc.cc 		\
+	PDFDoc.h		\
+	PDFDocEncoding.cc	\
+	PDFDocEncoding.h	\
+	PSTokenizer.cc		\
+	PSTokenizer.h		\
+	Stream-CCITT.h		\
 	Stream.cc 		\
+	Stream.h		\
+	UnicodeMap.cc		\
+	UnicodeMap.h		\
+	UnicodeMapTables.h	\
+	UnicodeTypeTable.cc	\
+	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	\
-	XRef.cc
+	TextOutputDev.h		\
+	UTF8.h
 
-gpdf_CFLAGS = 
+ANNOTS_VIEW_SRCS =
 
-gpdf_SOURCES = 			\
-	$(common_sources)	\
-	GOutputDev.cc		\
-	gpdf.cc
+if USE_ANNOTS_VIEW
+  ANNOTS_VIEW_SRCS += 			\
+	gpdf-annots-view.cc		\
+	gpdf-annots-view.h
+endif
 
-gpdf_LDADD =			\
-	$(EXTRA_GNOME_LIBS)	\
-	../goo/libgoo.a
+libgpdf_a_SOURCES =			\
+	BonoboStream.cc			\
+	BonoboStream.h			\
+	GnomeVFSStream.cc		\
+	GnomeVFSStream.h		\
+	GPOutputDev.cc			\
+	GPOutputDev.h			\
+	PSOutputDev.cc			\
+	PSOutputDev.h			\
+	gpdf-hig-dialog.c		\
+	gpdf-hig-dialog.h		\
+	Thumb.cc			\
+	Thumb.h				\
+	gpdf-control.cc			\
+	gpdf-control.h			\
+	gpdf-control-private.h		\
+	gpdf-g-switch.h			\
+	gpdf-link-canvas-item.cc	\
+	gpdf-link-canvas-item.h		\
+	gpdf-links-canvas-layer.cc	\
+	gpdf-links-canvas-layer.h	\
+	gpdf-persist-file.cc		\
+	gpdf-persist-file.h		\
+	gpdf-persist-stream.cc		\
+	gpdf-persist-stream.h		\
+	gpdf-stock-icons.c		\
+	gpdf-stock-icons.h		\
+	gpdf-util.h			\
+	gpdf-view.cc			\
+	gpdf-view.h			\
+	gpdf-bookmarks-view.cc		\
+	gpdf-bookmarks-view.h		\
+	gpdf-thumbnails-view.cc		\
+	gpdf-thumbnails-view.h		\
+	$(ANNOTS_VIEW_SRCS)		\
+	eel-gconf-extensions.c		\
+	eel-gconf-extensions.h		\
+	prefs-strings.h			\
+	gpdf-sidebar.c			\
+	gpdf-sidebar.h			\
+	gtkgesture.c			\
+	gtkgesture.h			\
+	page-control.c			\
+	page-control.h			\
+	pdf-info-dict-util.cc		\
+	pdf-info-dict-util.h		\
+	pdf-properties-display.c	\
+	pdf-properties-display.h	\
+	gpdf-font-face.c		\
+	gpdf-font-face.h		\
+	$(marshal_sources)
+
+gnome_pdf_viewer_SOURCES =		\
+	$(common_sources)		\
+	bonobo-application-x-pdf.cc	\
+	nautilus-pdf-property-page.cc	\
+	nautilus-pdf-property-page.h
 
-bonobo_image_x_pdf_SOURCES =	\
-	$(common_sources)	\
-	BonoboFile.h		\
-	BonoboFile.cc		\
-	GOutputDev.cc		\
-	bonobo-image-x-pdf.cc
-
-bonobo_image_x_pdf_CFLAGS  =	\
-	-DBONOBO_IO
-
-bonobo_image_x_pdf_LDADD =	\
-	../goo/libgoo.a		\
-	$(GTK_LIBS)		\
-	$(GNOME_LIBDIR)		\
-	-lbonobo		\
-	$(GNOMEGNORBA_LIBS)	\
-	$(INTLLIBS)
+
+# 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
+
+gnome_pdf_viewer_LDADD =					\
+	libxpdf.a						\
+	libgpdf.a						\
+	$(top_builddir)/goo/libGoo.a				\
+	$(top_builddir)/lib/ggv-sidebar/libggv-sidebar.a	\
+	$(EXTRA_GNOME_LIBS)					\
+	$(libpaper_LIBS)
 
 xpdf_SOURCES =			\
 	$(common_sources)	\
+	XPDFApp.cc		\
+	XPDFApp.h		\
+	XPDFCore.cc		\
+	XPDFCore.h		\
+	XPDFTree.cc		\
+	XPDFTree.h		\
+	XPDFViewer.cc		\
+	XPDFViewer.h		\
 	XOutputDev.cc		\
-	LTKOutputDev.cc		\
+	XOutputDev.h		\
+	XPixmapOutputDev.cc	\
+	XPixmapOutputDev.h	\
 	PSOutputDev.cc		\
+	PSOutputDev.h		\
 	xpdf.cc
 
 xpdf_CFLAGS = $(X_CFLAGS)
-xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) 
+xpdf_LDADD = 				\
+	libxpdf.a			\
+	$(top_builddir)/goo/libGoo.a 	\
+	-lXpm                           \
+	$(EXTRA_GNOME_LIBS) 		\
+	$(libpaper_LIBS)
 
-pdfimages_SOURCES =		\
-	$(common_sources)	\
-	ImageOutputDev.cc	\
-	pdfimages.cc
+#pdfimages_SOURCES =		
+#	$(common_sources)	
+#	ImageOutputDev.cc	
+#	ImageOutputDev.h	
+#	pdfimages.cc
 
-pdfimages_LDADD = ../goo/libgoo.a
+#pdfimages_LDADD = ../goo/libGoo.a
+#
+#pdftops_SOURCES =		
+#	$(common_sources)	
+#	PSOutputDev.cc		
+#       pdftops.cc
+#pdftops_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
 
-pdftotext_SOURCES =		\
-	$(common_sources)	\
-	pdftotext.cc
-pdftotext_LDADD = ../goo/libgoo.a
+#pdfinfo_SOURCES =		
+#	$(common_sources)	
+#	pdfinfo.cc
+#pdfinfo_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_SOURCES =		\
-	$(common_sources)	\
-	PBMOutputDev.cc		\
-	XOutputDev.cc		\
-	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		
-
-ltk = 			\
-	xpdf-flip.ltk	\
-	xpdf-top.ltk	\
-	xpdf.ltk
-
-gladedir   = $(datadir)/xpdf/glade
-
-glade_DATA = 		\
-	about.glade	\
-	gpdf.glade
-
-EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(glade_DATA)
+#pdftopbm_LDADD = ../goo/libGoo.a $(EXTRA_GNOME_LIBS)
+
+#bitmaps =		
+#	about.xbm		
+#	dblLeftArrow.xbm	
+#	dblRightArrow.xbm	
+#	find.xbm		
+#	leftArrow.xbm		
+#	postscript.xbm		
+#	rightArrow.xbm		
+#	xpdfIcon.xpm		
+#	zoomIn.xbm		
+#	zoomOut.xbm		
+
+gpdf-marshal.h: gpdf-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=gpdf_marshal > $@
+
+gpdf-marshal.c: gpdf-marshal.list $(GLIB_GENMARSHAL)
+	echo "#include \"gpdf-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=gpdf_marshal >> $@
+
+BUILT_SOURCES = $(marshal_sources)
+DONT_DIST_SOURCE = $(marshal_sources)
+
+dist-hook:
+	for file in $(DONT_DIST_SOURCE) ; do \
+	    rm -f $(distdir)/$$file ; \
+	done
+
+STOCK_ANNOTS_ICONS = 
+
+if USE_ANNOTS_VIEW
+  STOCK_ANNOTS_ICONS += 			\
+	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
+
+stockdir = $(datadir)/pixmaps/gpdf
+stock_DATA = 				\
+	fitwidth.png			\
+	stock_book-closed-mark.png	\
+	stock_book-closed.png		\
+	stock_book-opened-mark.png	\
+	stock_book-opened.png		\
+	stock_bookmarks.png		\
+	$(STOCK_ANNOTS_ICONS)
+
+gladedir = $(datadir)/gpdf/glade
+glade_DATA =					\
+	gpdf-print-progress-dialog.glade	\
+	gpdf-properties-dialog.glade
+
+server_in_files = GNOME_PDF.server.in.in
+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@
+
+uidir = $(datadir)/gnome-2.0/ui
+ui_DATA =				\
+	gpdf-control-ui.xml
+
+CLEANFILES =				\
+	$(server_DATA)			\
+	$(server_in_files:.server.in.in=.server.in) \
+	$(marshal_sources)
+
+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