X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=4061c31de108f563f321f2342b419c50d37747be;hb=70693deccf54d178c25d7f89c1b2d4a51fa5316f;hp=27326a718022e0f8dad3177c219012df4e16d807;hpb=57eb84b3aa7def409e9b9939828b0a1f608e9a0e;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 27326a71..4061c31d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES=						\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	$(SHELL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED)
+	$(GNOME_PRINT_CFLAGS)
 
 bin_PROGRAMS=evince
 
@@ -20,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		\
@@ -42,14 +38,15 @@ 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		\
 	ev-properties-fonts.h		\
 	ev-utils.c			\
 	ev-utils.h			\
+	ev-view-accessible.c		\
+	ev-view-accessible.h		\
+	ev-view-private.h		\
 	ev-view.c			\
 	ev-view.h			\
 	ev-window.c			\
@@ -64,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
 
@@ -86,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