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=c8703c059854bdb58a39025d271ed1d3f8eb4fac;hb=dda75bc2dbcd9a6ed5507bb0609f057846edc261;hp=a8ba810fa2679291b383121348417a1690bbace0;hpb=14d8faba24b8f51ee59c6177690065e7a58336ba;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index a8ba810f..c8703c05 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,5 +1,3 @@
-NULL=
-
 INCLUDES=						\
 	-DDATADIR=\"$(pkgdatadir)\"			\
 	-DGNOMEDATADIR=\"$(datadir)\"			\
@@ -13,12 +11,7 @@ INCLUDES=						\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	$(SHELL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED)				\
-	$(NULL)
-
-if ENABLE_DBUS
-INCLUDES += $(DBUS_CFLAGS)
-endif
+	$(GNOME_PRINT_CFLAGS)
 
 bin_PROGRAMS=evince
 
@@ -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			\
@@ -47,18 +42,21 @@ 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-links.c		\
@@ -67,34 +65,25 @@ evince_SOURCES=				\
 	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				\
-	$(NULL)
+	main.c
 
-if ENABLE_METADATA
-evince_SOURCES += \
-	ev-metadata-manager.h		\
-	ev-metadata-manager.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/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
+	$(SHELL_LIBS)							\
+	$(GNOME_PRINT_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
@@ -102,20 +91,24 @@ 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
 
-ev-marshal.c: ev-marshal.list
+ev-marshal.h: $(srcdir)/ev-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
+
+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: 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