X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=6c1cdcf7d8bf8b035724ba3657b1bfe76f36c3e8;hb=e02e3fde2610db645a005f276286795025426186;hp=f756f6228faf2209fcee9ceb5f268e2fc92e1f0c;hpb=1b943a1adb5fb356a8054af16384141cce8f9779;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index f756f622..6c1cdcf7 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -2,7 +2,6 @@ INCLUDES=						\
 	-DDATADIR=\"$(pkgdatadir)\"			\
 	-DGNOMEDATADIR=\"$(datadir)\"			\
 	-I$(top_srcdir)/lib				\
-	-I$(top_srcdir)/cut-n-paste/recent-files/	\
 	-I$(top_srcdir)/cut-n-paste/zoom-control/	\
 	-I$(top_srcdir)/cut-n-paste/toolbar-editor/	\
 	-I$(top_srcdir)/backend				\
@@ -11,7 +10,15 @@ INCLUDES=						\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	$(SHELL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED)
+	$(DISABLE_DEPRECATED)				\
+	$(GNOME_PRINT_CFLAGS)				\
+	$(GTK_PRINT_CFLAGS)
+
+if HAVE_GTK_RECENT
+INCLUDES +=
+else
+INCLUDES += -I$(top_srcdir)/cut-n-paste/recent-files/
+endif
 
 bin_PROGRAMS=evince
 
@@ -20,14 +27,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,39 +45,67 @@ 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			\
 	ev-window.h			\
+	ev-window-title.c		\
+	ev-window-title.h		\
 	ev-sidebar.c			\
 	ev-sidebar.h			\
+	ev-sidebar-attachments.c	\
+	ev-sidebar-attachments.h	\
 	ev-sidebar-links.c		\
 	ev-sidebar-links.h		\
 	ev-sidebar-page.c		\
 	ev-sidebar-page.h		\
 	ev-sidebar-thumbnails.c		\
 	ev-sidebar-thumbnails.h		\
-	ev-statusbar.c			\
-	ev-statusbar.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=								\
-	$(SHELL_LIBS)							\
-	$(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
+	$(top_builddir)/lib/libev.la					\
+	$(SHELL_LIBS)							\
+	$(GNOME_PRINT_LIBS)
+
+if HAVE_GTK_RECENT
+evince_LDADD +=
+else
+evince_LDADD += $(top_builddir)/cut-n-paste/recent-files/librecent.la
+endif
+
+if ENABLE_DJVU
+evince_LDADD +=	$(DJVU_LIBS)
+endif
+
+if ENABLE_DVI
+evince_LDADD +=	-lkpathsea
+endif
+
+if WITH_TYPE1_FONTS
+evince_LDADD += -lt1
+endif
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
@@ -83,16 +114,18 @@ BUILT_SOURCES += ev-application-service.h
 endif
 
 EXTRA_DIST = ev-marshal.list		\
-	ev-application-service.h	\
 	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
 
 if DBUS_TOOL_NO_PREFIX
 ev-application-service.h: $(srcdir)/ev-application-service.xml