X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=4ce5bce8147b418d20603dbfa55e23765808cdaa;hb=3975d110064cd88af69d393f956f8158aae1878f;hp=26b195e7c54fcc9f3aae44dea067844c881ad452;hpb=f2511820a5499da40ae972bc833616a176d78f8f;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 26b195e7..4ce5bce8 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES=						\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	$(SHELL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)				\
 	$(GNOME_PRINT_CFLAGS)
 
 bin_PROGRAMS=evince
@@ -20,14 +21,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		\
@@ -59,6 +56,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		\
@@ -85,6 +84,18 @@ evince_LDADD=								\
 	$(SHELL_LIBS)							\
 	$(GNOME_PRINT_LIBS)
 
+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
@@ -95,12 +106,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