Fix ChangeLog a bit

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0fed805e35d7204f5462744419284e15f6783107..4061c31de108f563f321f2342b419c50d37747be 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -10,7 +10,8 @@ INCLUDES=                                             \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"         \
        $(SHELL_CFLAGS)                                 \
-       $(WARN_CFLAGS)                                  
+       $(WARN_CFLAGS)                                  \
+       $(GNOME_PRINT_CFLAGS)
 
 bin_PROGRAMS=evince
 
@@ -19,14 +20,10 @@ evince_SOURCES=                             \
        eggfindbar.h                    \
        ev-application.c                \
        ev-application.h                \
-       ev-document-types.c             \
-       ev-document-types.h             \
        ev-job-queue.h                  \
        ev-job-queue.c                  \
        ev-jobs.h                       \
        ev-jobs.c                       \
-       ev-job-xfer.c                   \
-       ev-job-xfer.h                   \
        ev-marshal.c                    \
        ev-marshal.h                    \
        ev-metadata-manager.c           \
@@ -41,8 +38,6 @@ evince_SOURCES=                               \
        ev-password-view.c              \
        ev-pixbuf-cache.c               \
        ev-pixbuf-cache.h               \
-       ev-print-job.c                  \
-       ev-print-job.h                  \
        ev-properties-dialog.c          \
        ev-properties-dialog.h          \
        ev-properties-fonts.c           \
@@ -66,17 +61,27 @@ evince_SOURCES=                             \
        ev-sidebar-page.h               \
        ev-sidebar-thumbnails.c         \
        ev-sidebar-thumbnails.h         \
+       ev-attachment-bar.c             \
+       ev-attachment-bar.h             \
        ev-stock-icons.c                \
        ev-stock-icons.h                \
        main.c
 
+if WITH_GNOME_PRINT
+evince_SOURCES+=                       \
+       ev-print-job.c                  \
+       ev-print-job.h
+endif
+
+
 evince_LDADD=                                                          \
        $(top_builddir)/cut-n-paste/recent-files/librecent.la           \
        $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la         \
        $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la  \
        $(top_builddir)/properties/libevproperties.la                   \
-       $(top_builddir)/lib/libev.la    \
-       $(SHELL_LIBS)
+       $(top_builddir)/lib/libev.la                                    \
+       $(SHELL_LIBS)                                                   \
+       $(GNOME_PRINT_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
@@ -88,12 +93,12 @@ EXTRA_DIST = ev-marshal.list                \
        ev-application-service.xml
 
 
-ev-marshal.h: ev-marshal.list
-       glib-genmarshal --prefix=ev_marshal ev-marshal.list --header > ev-marshal.h
+ev-marshal.h: $(srcdir)/ev-marshal.list
+       $(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
 
-ev-marshal.c: ev-marshal.list
+ev-marshal.c: $(srcdir)/ev-marshal.list
        echo '#include "ev-marshal.h"' > ev-marshal.c
-       glib-genmarshal --prefix=ev_marshal ev-marshal.list --body >> ev-marshal.c
+       $(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --body >> ev-marshal.c
 
 DISTCLEANFILES= \
        ev-application-service.h