X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=dffbb75025478d6bc9cf52980fed28fc7cee2aef;hb=1ba681aa9eb43a60f0a01c1939e70f9f6de755c7;hp=a95b57dfa7a26a240e084a8fa8c2b65b6bae1c4e;hpb=c6c3e49776af18ae7a8ce433ac31121a0cdfbc6d;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index a95b57df..dffbb750 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,5 +1,3 @@
-NULL=
-
 INCLUDES=						\
 	-DDATADIR=\"$(pkgdatadir)\"			\
 	-DGNOMEDATADIR=\"$(datadir)\"			\
@@ -13,17 +11,11 @@ INCLUDES=						\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	$(SHELL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED)				\
-	$(NULL)
-
-if ENABLE_DBUS
-INCLUDES += $(DBUS_CFLAGS)
-endif
+	$(DISABLE_DEPRECATED)
 
 bin_PROGRAMS=evince
 
 evince_SOURCES=				\
-	dummy.cc			\
 	eggfindbar.c			\
 	eggfindbar.h			\
 	ev-application.c		\
@@ -38,6 +30,8 @@ evince_SOURCES=				\
 	ev-job-xfer.h			\
 	ev-marshal.c			\
 	ev-marshal.h			\
+	ev-metadata-manager.c		\
+	ev-metadata-manager.h		\
 	ev-page-action.c		\
 	ev-page-action.h		\
 	ev-page-cache.h			\
@@ -72,30 +66,15 @@ evince_SOURCES=				\
 	ev-statusbar.h			\
 	ev-stock-icons.c		\
 	ev-stock-icons.h		\
-	main.c				\
-	$(NULL)
-
-if ENABLE_METADATA
-evince_SOURCES += \
-	ev-metadata-manager.h		\
-	ev-metadata-manager.c
-endif
+	main.c
 
 evince_LDADD=								\
 	$(SHELL_LIBS)							\
 	$(top_builddir)/cut-n-paste/recent-files/librecent.la		\
-	$(top_builddir)/cut-n-paste/zoom-control/libephymisc.la		\
-	$(top_builddir)/cut-n-paste/zoom-control/libephywidgets.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)/backend/libevbackend.la				\
-	-ltiff -lz							\
-	$(NULL)
-
-if ENABLE_DBUS
-evince_LDADD += $(DBUS_LIBS)
-endif
+	$(top_builddir)/lib/libev.la
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c