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

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0e80fe91..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)					\
-	$(GNOME_PRINT_CFLAGS)
+	$(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
 
@@ -24,8 +31,6 @@ evince_SOURCES=				\
 	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		\
@@ -57,6 +62,8 @@ evince_SOURCES=				\
 	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		\
@@ -75,7 +82,6 @@ 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			\
@@ -83,6 +89,24 @@ evince_LDADD=								\
 	$(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
 
 if ENABLE_DBUS