Imported Xpdf 2.03 and fixed build.

[evince.git] / pdf / xpdf / Makefile.am

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 6bc669854ecadb2912527481af7db675a5271a4f..96d57ec267e41302962764bd283c0007a53e8f37 100644 (file)
--- 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