page number entry widget (for the toolbar)

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

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 98b90839d84f13485c753ccd42c9955dec70cbba..cfebfdf04e2d72732e2c9a009f40de0ccdecad86 100644 (file)
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES =                                                      \
        -I$(top_srcdir)/ltk                                     \
        -DDATADIR=\""$(datadir)"\"                              \
         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -I$(top_srcdir)/ltk                                     \
        -DDATADIR=\""$(datadir)"\"                              \
         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \

-       $(EXTRA_GNOME_CFLAGS)                   \
+       -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"                 \
+       $(EXTRA_GNOME_CFLAGS)                                   \

        $(libpaper_CFLAGS)
 
 if WITH_GNOME
        $(libpaper_CFLAGS)
 
 if WITH_GNOME


@@ -103,8 +104,6 @@ gnome_pdf_viewer_SOURCES =          \
        $(common_sources)               \
        BonoboStream.h                  \
        BonoboStream.cc                 \
        $(common_sources)               \
        BonoboStream.h                  \
        BonoboStream.cc                 \

-       GOutputDev.cc                   \
-       GOutputDev.h                    \

        GPOutputDev.cc                  \
        GPOutputDev.h                   \
        bonobo-application-x-pdf.cc     \
        GPOutputDev.cc                  \
        GPOutputDev.h                   \
        bonobo-application-x-pdf.cc     \


@@ -118,12 +117,22 @@ gnome_pdf_viewer_SOURCES =                \
        gpdf-view.h                     \
        gtkgesture.c                    \
        gtkgesture.h                    \
        gpdf-view.h                     \
        gtkgesture.c                    \
        gtkgesture.h                    \

-       pdf-view.cc                     \
-       pdf-view.h
+       page-control.c                  \
+       page-control.h
+
+# Font embedding hack for Gnome Print < 2.1.?2?
+#      gpdf-gnome-font.c               \
+#      gpdf-gnome-font.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.cc              \
 #      gpdf-embeddable.h               \
 #      gpdf-embeddable-view.cc         \

-#      gpdf-embeddable-view.h          \
+#      gpdf-embeddable-view.h

 
 gnome_pdf_viewer_LDADD =               \
        $(top_builddir)/goo/libgoo.a    \
 
 gnome_pdf_viewer_LDADD =               \
        $(top_builddir)/goo/libgoo.a    \


@@ -200,7 +209,7 @@ xpdf-ltk.h: xpdf.ltk
 
 
 stockdir = $(datadir)/pixmaps/gpdf
 
 
 stockdir = $(datadir)/pixmaps/gpdf

-stock_DATA = stock-zoom-fit-wide.xpm
+stock_DATA = fitwidth.png

 
 ltk =                  \
        xpdf-flip.ltk   \
 
 ltk =                  \
        xpdf-flip.ltk   \


@@ -221,6 +230,5 @@ ui_DATA =                           \
        bonobo-application-x-pdf-ui.xml \
        gpdf-control-ui.xml
 
        bonobo-application-x-pdf-ui.xml \
        gpdf-control-ui.xml
 

-

 EXTRA_DIST = $(stock_DATA) $(ltk)      \
              $(server_in_files) config.h $(ui_DATA)
 EXTRA_DIST = $(stock_DATA) $(ltk)      \
              $(server_in_files) config.h $(ui_DATA)