X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pdf%2Fxpdf%2FMakefile.am;h=69c42b680d2ca8fa332c5dc30ea8fbf944f26b07;hb=884f739665dc56e66f51e104350f2affd33f2dd8;hp=ffb96d7ef440e8b9b20b9588b2803eb70a83bc33;hpb=ec7ac46534baa755fb21806c68405191ed602597;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index ffb96d7e..69c42b68 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -1,12 +1,15 @@
-# SUBDIRS = . tests
+SUBDIRS = . tests
 
 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)				\
 	$(WARN_CFLAGS)						\
 	$(libpaper_CFLAGS)
 
@@ -16,7 +19,7 @@ else
 gui = xpdf
 endif
 
-BUILT_SOURCES = 			\
+marshal_sources =			\
 	gpdf-marshal.c			\
 	gpdf-marshal.h	
 
@@ -34,6 +37,7 @@ libxpdf_a_SOURCES =		\
 	Annot.h			\
 	Array.cc 		\
 	Array.h			\
+	BaseFile.h		\
 	BuiltinFont.cc		\
 	BuiltinFont.h		\
 	BuiltinFontTables.cc	\
@@ -76,6 +80,8 @@ libxpdf_a_SOURCES =		\
 	Object.h		\
 	Outline.cc		\
 	Outline.h		\
+	OutputDev.cc 		\
+	OutputDev.h		\
 	Page.cc 		\
 	Page.h			\
 	Parser.cc 		\
@@ -96,7 +102,6 @@ libxpdf_a_SOURCES =		\
 	XRef.h
 
 common_sources =		\
-	BaseFile.h		\
 	CharTypes.h		\
 	CompactFontTables.h	\
 	DisplayFontTable.h	\
@@ -104,8 +109,6 @@ common_sources =		\
 	FTFont.cc		\
 	FTFont.h		\
 	NameToUnicodeTable.h	\
-	OutputDev.cc 		\
-	OutputDev.h		\
 	SFont.cc		\
 	SFont.h			\
 	T1Font.cc		\
@@ -117,23 +120,25 @@ common_sources =		\
 	UTF8.h
 
 libgpdf_a_SOURCES =			\
-	gpdf-link-canvas-item.cc	\
-	gpdf-link-canvas-item.h		\
-	gpdf-links-canvas-layer.cc	\
-	gpdf-links-canvas-layer.h
-
-gnome_pdf_viewer_SOURCES =		\
-	$(common_sources)		\
 	BonoboStream.cc			\
 	BonoboStream.h			\
 	GnomeVFSStream.cc		\
 	GnomeVFSStream.h		\
 	GPOutputDev.cc			\
 	GPOutputDev.h			\
-	bonobo-application-x-pdf.cc	\
+	PSOutputDev.cc			\
+	PSOutputDev.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		\
@@ -143,15 +148,21 @@ gnome_pdf_viewer_SOURCES =		\
 	gpdf-view.h			\
 	gtkgesture.c			\
 	gtkgesture.h			\
-	nautilus-pdf-property-page.cc	\
-	nautilus-pdf-property-page.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	\
-	$(BUILT_SOURCES)
+	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
@@ -164,11 +175,12 @@ gnome_pdf_viewer_SOURCES =		\
 # 	gpdf-embeddable-view.cc		\
 # 	gpdf-embeddable-view.h
 
-gnome_pdf_viewer_LDADD =		\
-	libxpdf.a			\
-	libgpdf.a			\
-	$(top_builddir)/goo/libGoo.a	\
-	$(EXTRA_GNOME_LIBS)		\
+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 =			\
@@ -251,11 +263,20 @@ 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
+
 stockdir = $(datadir)/pixmaps/gpdf
 stock_DATA = fitwidth.png
 
 gladedir = $(datadir)/gpdf/glade
-glade_DATA = 				\
+glade_DATA =					\
+	gpdf-print-progress-dialog.glade	\
 	gpdf-properties-dialog.glade
 
 server_in_files = GNOME_PDF.server.in.in
@@ -272,7 +293,7 @@ ui_DATA =				\
 CLEANFILES =				\
 	$(server_DATA)			\
 	$(server_in_files:.server.in.in=.server.in) \
-	$(BUILT_SOURCES)
+	$(marshal_sources)
 
 EXTRA_DIST = $(stock_DATA)		\
 	gpdf-marshal.list		\