X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=ae0129017df89dcc4889b2e34a215f0b9fb0ce84;hb=a24ba773afb595b2be95a01702816aa66f50ac54;hp=80b6ea50fca29d1ba961df017e8f59843a95c688;hpb=02383ed04e6a5c215d6d3d4b961bc73b58a23b37;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 80b6ea50..ae012901 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,5 +1,3 @@
-NULL=
-
 INCLUDES=						\
 	-DDATADIR=\"$(pkgdatadir)\"			\
 	-DGNOMEDATADIR=\"$(datadir)\"			\
@@ -12,17 +10,12 @@ INCLUDES=						\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	$(SHELL_CFLAGS)					\
-	$(EVINCE_DISABLE_DEPRECATED)			\
-	$(NULL)
-
-if ENABLE_DBUS
-INCLUDES += $(DBUS_CFLAGS)
-endif
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)
 
 bin_PROGRAMS=evince
 
 evince_SOURCES=				\
-	dummy.cc			\
 	eggfindbar.c			\
 	eggfindbar.h			\
 	ev-application.c		\
@@ -37,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			\
@@ -71,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
 
@@ -102,8 +82,9 @@ if ENABLE_DBUS
 BUILT_SOURCES += ev-application-service.h
 endif
 
-EXTRA_DIST = ev-marshal.list \
-	     ev-application-service.h
+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
@@ -112,10 +93,13 @@ ev-marshal.c: ev-marshal.list
 	echo '#include "ev-marshal.h"' > ev-marshal.c
 	glib-genmarshal --prefix=ev_marshal ev-marshal.list --body >> ev-marshal.c
 
+DISTCLEANFILES= \
+	ev-application-service.h
+
 if DBUS_TOOL_NO_PREFIX
-ev-application-service.h: ev-application-service.xml
+ev-application-service.h: $(srcdir)/ev-application-service.xml
 	dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
 else
-ev-application-service.h: ev-application-service.xml
+ev-application-service.h: $(srcdir)/ev-application-service.xml
 	dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
 endif