X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=pdf%2Fxpdf%2FMakefile.am;h=e4d059c9c748d8bd1e94a1e2f8b3e19c9f7e20f5;hb=ed8d29b07f2233cbaa4c134b78710619049a652b;hp=696281a15d92094176bda07f3563b75e35232f6e;hpb=e78daed2cf3d3968c2e128e1c720c8828f272a0b;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 696281a1..e4d059c9 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,26 +1,37 @@
+SUBDIRS = . tests
 
-INCLUDES =					\
-	-I$(top_srcdir)/goo			\
-	-I$(top_srcdir)/ltk			\
-	-DDATADIR=\""$(datadir)"\"            	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EXTRA_GLIB_CFLAGS)			\
-	$(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)				\
+	$(WARN_CFLAGS)						\
 	$(libpaper_CFLAGS)
 
 if WITH_GNOME
-gui = gpdf
+gui =
 else
 gui = xpdf
 endif
 
-bin_PROGRAMS = 	$(gui)	bonobo-application-x-pdf
+marshal_sources =			\
+	gpdf-marshal.c			\
+	gpdf-marshal.h	
+
+bin_PROGRAMS = 	$(gui)
 #	pdftops pdftotext	
 #	pdfinfo	pdftopbm	
 #	pdfimages  		
 
+libexec_PROGRAMS = gnome-pdf-viewer
 
-common_sources =		\
+noinst_LIBRARIES = libxpdf.a libgpdf.a
+
+libxpdf_a_SOURCES =		\
 	Annot.cc		\
 	Annot.h			\
 	Array.cc 		\
@@ -30,24 +41,18 @@ 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		\
@@ -62,90 +67,144 @@ common_sources =		\
 	GfxState.h		\
 	GlobalParams.cc		\
 	GlobalParams.h		\
+	JBIG2Stream.cc		\
+	JBIG2Stream.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	\
 	XRef.cc			\
 	XRef.h
 
-gpdf_CFLAGS = 			\
-	-DBONOBO_IO
-
-gpdf_SOURCES = 			\
-	gpdf.cc
-
-gpdf_LDADD =			\
-	$(GTK_LIBS)		\
-	$(GNOME_LIBDIR)		\
-	$(EXTRA_GNOME_LIBS)	\
-	$(INTLLIBS)
+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
 
-bonobo_application_x_pdf_SOURCES =	\
-	$(common_sources)		\
-	BonoboStream.h			\
+libgpdf_a_SOURCES =			\
 	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		\
+	BonoboStream.h			\
+	GnomeVFSStream.cc		\
+	GnomeVFSStream.h		\
+	GPOutputDev.cc			\
+	GPOutputDev.h			\
+	eog-hig-dialog.c		\
+	eog-hig-dialog.h		\
+	gpdf-control.cc			\
+	gpdf-control.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			\
 	gtkgesture.c			\
-	gtkgesture.h
-
-bonobo_application_x_pdf_LDADD =	\
-	../goo/libgoo.a			\
-	$(GTK_LIBS)			\
-	$(GNOME_LIBDIR)			\
-	$(EXTRA_GNOME_LIBS)		\
-	$(EXTRA_GLIB_LIBS)		\
-	$(INTLLIBS)			\
+	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
+
+
+# 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) $(libpaper_CFLAGS)
+xpdf_LDADD = 				\
+	libxpdf.a			\
+	$(top_builddir)/goo/libGoo.a 	\
+	-lXpm                           \
+	$(EXTRA_GNOME_LIBS) 		\
+	$(libpaper_LIBS)
 
 #pdfimages_SOURCES =		
 #	$(common_sources)	
@@ -153,23 +212,23 @@ xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) $(libpape
 #	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_LDADD = ../goo/libGoo.a
 
 #pdftotext_SOURCES =		
 #	$(common_sources)	
 #	pdftotext.cc
-#pdftotext_LDADD = ../goo/libgoo.a
+#pdftotext_LDADD = ../goo/libGoo.a
 
 #pdfinfo_SOURCES =		
 #	$(common_sources)	
 #	pdfinfo.cc
-#pdfinfo_LDADD = ../goo/libgoo.a
+#pdfinfo_LDADD = ../goo/libGoo.a
 
 #pdftopbm_SOURCES =		
 #	$(common_sources)	
@@ -180,12 +239,7 @@ xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) $(libpape
 #	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 $@
+#pdftopbm_LDADD = ../goo/libGoo.a $(EXTRA_GNOME_LIBS)
 
 #bitmaps =		
 #	about.xbm		
@@ -199,28 +253,47 @@ xpdf-ltk.h: xpdf.ltk
 #	zoomIn.xbm		
 #	zoomOut.xbm		
 
+gpdf-marshal.h: gpdf-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=gpdf_marshal > $@
 
-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	
+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)
 
-ltk = 			\
-	xpdf-flip.ltk	\
-	xpdf-top.ltk	\
-	xpdf.ltk
+dist-hook:
+	for file in $(DONT_DIST_SOURCE) ; do \
+	    rm -f $(distdir)/$$file ; \
+	done
 
-oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_XPDF.oafinfo
+stockdir = $(datadir)/pixmaps/gpdf
+stock_DATA = fitwidth.png
 
-XML_FILES =				\
-	gpdf-ui.xml			\
-	bonobo-application-x-pdf-ui.xml
+gladedir = $(datadir)/gpdf/glade
+glade_DATA = 				\
+	gpdf-properties-dialog.glade
 
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
+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@
 
-EXTRA_DIST = $(stock_DATA) ChangeLog $(ltk)	\
-             $(oaf_DATA) config.h $(XML_FILES)
+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)
 
+EXTRA_DIST = $(stock_DATA)		\
+	gpdf-marshal.list		\
+	$(server_in_files) 		\
+	config.h 			\
+	$(ui_DATA)			\
+	$(glade_DATA)