get PDFDoc from GPdfPersistStream, not directly from our embeddable

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

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index c3806120f6a1fb177eac0fafd1b71641f89e6107..549810ef8f2944dda1371e91e23657d8306a80ff 100644 (file)
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -5,10 +5,11 @@ INCLUDES =                                    \
        -DDATADIR=\""$(datadir)"\"              \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
        $(EXTRA_GLIB_CFLAGS)                    \
-       $(EXTRA_GNOME_CFLAGS)
+       $(EXTRA_GNOME_CFLAGS)                   \
+       $(libpaper_CFLAGS)
 
 if WITH_GNOME
-gui = gpdf
+gui =
 else
 gui = xpdf
 endif
@@ -20,69 +21,84 @@ bin_PROGRAMS =      $(gui)  bonobo-application-x-pdf
 
 
 common_sources =               \
+       Annot.cc                \
+       Annot.h                 \
        Array.cc                \
        Array.h                 \
        BaseFile.h              \
+       BuiltinFont.cc          \
+       BuiltinFont.h           \
+       BuiltinFontTables.cc    \
+       BuiltinFontTables.h     \
+       CMap.cc                 \
+       CMap.h                  \
        Catalog.cc              \
        Catalog.h               \
-       CompactFontInfo.h       \
+       CharCodeToUnicode.cc    \
+       CharCodeToUnicode.h     \
+       CharTypes.h             \
+       CompactFontTables.h     \
        Decrypt.cc              \
        Decrypt.h               \
        Dict.cc                 \
        Dict.h                  \
+       DisplayFontTable.h      \
        Error.cc                \
        Error.h                 \
-       FontEncoding.cc         \
-       FontEncoding.h          \
+       ErrorCodes.h            \
+       FTFont.cc               \
+       FTFont.h                \
+       FontEncodingTables.cc   \
+       FontEncodingTables.h    \
        FontFile.cc             \
        FontFile.h              \
-       FontInfo.h              \
-       FormWidget.cc           \
-       FormWidget.h            \
+       Function.cc             \
+       Function.h              \
        Gfx.cc                  \
        Gfx.h                   \
        GfxFont.cc              \
        GfxFont.h               \
        GfxState.cc             \
        GfxState.h              \
+       GlobalParams.cc         \
+       GlobalParams.h          \
        Lexer.cc                \
        Lexer.h                 \
        Link.cc                 \
        Link.h                  \
+       NameToCharCode.cc       \
+       NameToCharCode.h        \
+       NameToUnicodeTable.h    \
        Object.cc               \
        Object.h                \
        OutputDev.cc            \
        OutputDev.h             \
+       PDFDoc.cc               \
+       PDFDoc.h                \
+       PSTokenizer.cc          \
+       PSTokenizer.h           \
        Page.cc                 \
        Page.h                  \
-       Params.cc               \
-       Params.h                \
        Parser.cc               \
        Parser.h                \
-       PDFDoc.cc               \
-       PDFDoc.h                \
-       StdFontInfo.h           \
+       SFont.cc                \
+       SFont.h                 \
+       Stream-CCITT.h          \
        Stream.cc               \
        Stream.h                \
-       Stream-CCITT.h          \
-       TextOutputDev.h         \
-       TextOutputFontInfo.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)
-
 bonobo_application_x_pdf_SOURCES =     \
        $(common_sources)               \
        BonoboStream.h                  \
@@ -91,8 +107,17 @@ bonobo_application_x_pdf_SOURCES =  \
        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          \
+       gpdf-persist-stream.cc          \
+       gpdf-persist-stream.h           \
+       gpdf-util.h                     \
        gtkgesture.c                    \
-       gtkgesture.h
+       gtkgesture.h                    \
+       pdf-view.cc                     \
+       pdf-view.h
 
 bonobo_application_x_pdf_LDADD =       \
        ../goo/libgoo.a                 \
@@ -100,24 +125,19 @@ bonobo_application_x_pdf_LDADD =  \
        $(GNOME_LIBDIR)                 \
        $(EXTRA_GNOME_LIBS)             \
        $(EXTRA_GLIB_LIBS)              \
-       $(INTLLIBS)
+       $(INTLLIBS)                     \
+       $(libpaper_LIBS)
 
 xpdf_SOURCES =                 \
        $(common_sources)       \
        XOutputDev.cc           \
-       SFont.cc                \
-       SFont.h                 \
-       T1Font.cc               \
-       T1Font.h                \
-       TTFont.cc               \
-       TTFont.h                \
        LTKOutputDev.cc         \
        PSOutputDev.cc          \
        PSOutputDev.h           \
        xpdf.cc
 
 xpdf_CFLAGS = $(X_CFLAGS)
-xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) 
+xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) $(libpaper_CFLAGS)
 
 #pdfimages_SOURCES =           
 #      $(common_sources)