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=6bc669854ecadb2912527481af7db675a5271a4f;hpb=b6f1cc94d28ba43ba9614eeff5d122b772e6e668;p=evince.git

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 6bc66985..96d57ec2 100644
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -10,7 +10,6 @@ INCLUDES =							\
 	$(EXTRA_GNOME_CFLAGS)					\
 	$(GNOME_PRINT_PRIVATE_CFLAGS)				\
 	$(GPDF_DEPRECATED_CFLAGS)				\
-	$(WARN_CFLAGS)						\
 	$(libpaper_CFLAGS)
 
 if WITH_GNOME
@@ -98,6 +97,7 @@ libxpdf_a_SOURCES =		\
 	UnicodeMap.cc		\
 	UnicodeMap.h		\
 	UnicodeMapTables.h	\
+	UnicodeTypeTable.cc	\
 	XRef.cc			\
 	XRef.h
 
@@ -349,9 +349,36 @@ CLEANFILES =				\
 	$(server_in_files:.server.in.in=.server.in) \
 	$(marshal_sources)
 
-EXTRA_DIST = $(stock_DATA)		\
+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