(eog_hig_dialog_new): add terminating NULL in g_object_set.

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

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index a8c3a23d1dc0481954bff274f2988300a4dbccef..e4d059c9c748d8bd1e94a1e2f8b3e19c9f7e20f5 100644 (file)
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -3,10 +3,12 @@ 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)                           \
        $(WARN_CFLAGS)                                          \
        $(libpaper_CFLAGS)
 
@@ -34,6 +36,7 @@ libxpdf_a_SOURCES =           \
        Annot.h                 \
        Array.cc                \
        Array.h                 \
+       BaseFile.h              \
        BuiltinFont.cc          \
        BuiltinFont.h           \
        BuiltinFontTables.cc    \
@@ -76,6 +79,8 @@ libxpdf_a_SOURCES =           \
        Object.h                \
        Outline.cc              \
        Outline.h               \
+       OutputDev.cc            \
+       OutputDev.h             \
        Page.cc                 \
        Page.h                  \
        Parser.cc               \
@@ -96,7 +101,6 @@ libxpdf_a_SOURCES =          \
        XRef.h
 
 common_sources =               \
-       BaseFile.h              \
        CharTypes.h             \
        CompactFontTables.h     \
        DisplayFontTable.h      \
@@ -104,8 +108,6 @@ common_sources =            \
        FTFont.cc               \
        FTFont.h                \
        NameToUnicodeTable.h    \
-       OutputDev.cc            \
-       OutputDev.h             \
        SFont.cc                \
        SFont.h                 \
        T1Font.cc               \
@@ -117,23 +119,23 @@ 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     \
+       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,16 +145,22 @@ 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        \
+       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
 #      GOutputDev.cc                   \
@@ -164,11 +172,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,6 +260,14 @@ 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
 
@@ -272,7 +289,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               \
@@ -280,11 +297,3 @@ EXTRA_DIST = $(stock_DATA)         \
        config.h                        \
        $(ui_DATA)                      \
        $(glade_DATA)
-
-DONT_DIST_SOURCE = $(marshal_sources)
-
-dist-hook:
-       for file in $(DONT_DIST_SOURCE) ; do \
-           rm -f $(distdir)/$$file ; \
-       done
-