X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=a8ba810fa2679291b383121348417a1690bbace0;hb=848665b157185945d190a7a746d054d7f5d5e6e0;hp=b03eed4b8dbbccef21fd69d0ed2b8fee391a415e;hpb=c3e1500a4815225f08e1b20dd066559e8c92c280;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index b03eed4b..a8ba810f 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -5,30 +5,42 @@ INCLUDES=						\
 	-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				\
-	-I$(top_srcdir)/pdf				\
-	-I$(top_srcdir)/pixbuf				\
-	-I$(top_srcdir)/ps	                	\
-	-I$(top_srcdir)/djvu				\
-	-I$(top_srcdir)/dvi				\
+	-I$(top_srcdir)/properties			\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	$(SHELL_CFLAGS)					\
-	$(EVINCE_DISABLE_DEPRECATED)			\
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED)				\
 	$(NULL)
 
+if ENABLE_DBUS
+INCLUDES += $(DBUS_CFLAGS)
+endif
+
 bin_PROGRAMS=evince
 
 evince_SOURCES=				\
-	dummy.cc			\
 	eggfindbar.c			\
 	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-page-action.c		\
 	ev-page-action.h		\
+	ev-page-cache.h			\
+	ev-page-cache.c			\
 	ev-password.h			\
 	ev-password.c			\
 	ev-password-view.h		\
@@ -37,6 +49,10 @@ evince_SOURCES=				\
 	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.c			\
@@ -47,44 +63,47 @@ evince_SOURCES=				\
 	ev-sidebar.h			\
 	ev-sidebar-links.c		\
 	ev-sidebar-links.h		\
+	ev-sidebar-page.c		\
+	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)
 
-evince_LDADD=							\
-	$(SHELL_LIBS)						\
-	$(top_builddir)/cut-n-paste/recent-files/librecent.la	\
-	$(top_builddir)/lib/libev.la				\
-	$(top_builddir)/pdf/libpdfdocument.la	 		\
-	$(top_builddir)/pixbuf/libpixbufdocument.la		\
-	$(top_builddir)/ps/libgtkgs.la				\
-	$(top_builddir)/backend/libevbackend.la			\
-	$(NULL)
-
-if ENABLE_DJVU
-evince_LDADD += 				\
-	-ldjvulibre 				\
-	-lpthread   				\
-	$(top_builddir)/djvu/libgtkdjvu.la	\
-	$(NULL)
+if ENABLE_METADATA
+evince_SOURCES += \
+	ev-metadata-manager.h		\
+	ev-metadata-manager.c
 endif
 
-if ENABLE_DVI
-evince_LDADD += 				\
-	$(top_builddir)/dvi/libgtkdvi.la	\
+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/toolbar-editor/libtoolbareditor.la	\
+	$(top_builddir)/properties/libevproperties.la			\
+	$(top_builddir)/lib/libev.la					\
+	$(top_builddir)/backend/libevbackend.la				\
+	-ltiff -lz							\
 	$(NULL)
-endif
 
-if WITH_TYPE1_FONTS
-evince_LDADD += -lt1lib
+if ENABLE_DBUS
+evince_LDADD += $(DBUS_LIBS)
 endif
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
-EXTRA_DIST = ev-marshal.list
+if ENABLE_DBUS
+BUILT_SOURCES += ev-application-service.h
+endif
+
+EXTRA_DIST = ev-marshal.list \
+	     ev-application-service.h
 
 ev-marshal.h: ev-marshal.list
 	glib-genmarshal --prefix=ev_marshal ev-marshal.list --header > ev-marshal.h
@@ -92,3 +111,11 @@ ev-marshal.h: ev-marshal.list
 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
+
+if DBUS_TOOL_NO_PREFIX
+ev-application-service.h: 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
+	dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+endif