X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2FMakefile.am;h=f4b3e0a6f74afafe29903933760cdcae7075c4a5;hb=f51872613abaaa42c716e2fe6a2e4695c529dc4b;hp=2b88796752165f9765a9cc21b88b32b7399034e2;hpb=ffd47fa767f69c0b534037a6e067534d7d2345c9;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 2b887967..f4b3e0a6 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,72 +1,45 @@
-NULL=
-
 INCLUDES=						\
 	-DDATADIR=\"$(pkgdatadir)\"			\
 	-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)/cut-n-paste/totem-screensaver/	\
+	-I$(top_srcdir)/cut-n-paste/gedit-message-area/	\
+	-I$(top_srcdir)/libdocument			\
 	-I$(top_srcdir)/properties			\
 	-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
-noinst_LTLIBRARIES = libevbackendfactory.la
-
-libevbackendfactory_la_SOURCES =
-
-libevbackendfactory_la_LIBADD = 			\
-	$(top_builddir)/pdf/libpdfdocument.la	 	\
-	$(top_builddir)/pixbuf/libpixbufdocument.la	\
-	$(top_builddir)/ps/libgtkgs.la			\
-	$(top_builddir)/backend/libevbackend.la		\
-	$(NULL)
-
-if ENABLE_DJVU
-libevbackendfactory_la_LIBADD += 		\
-	$(top_builddir)/djvu/libgtkdjvu.la	\
-	$(NULL)
-endif
-
-if ENABLE_TIFF
-libevbackendfactory_la_LIBADD += 		\
-	$(top_builddir)/tiff/libtiffdocument.la	\
-	$(NULL)
-endif
-
-if ENABLE_DVI
-libevbackendfactory_la_LIBADD += 		\
-	$(top_builddir)/dvi/libgtkdvi.la	\
-	$(NULL)
-endif
 
 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-history.c			\
+	ev-history.h			\
 	ev-marshal.c			\
 	ev-marshal.h			\
+	ev-message-area.c		\
+	ev-message-area.h		\
+	ev-metadata-manager.c		\
+	ev-metadata-manager.h		\
+	ev-navigation-action.c		\
+	ev-navigation-action.h		\
+	ev-navigation-action-widget.c	\
+	ev-navigation-action-widget.h	\
 	ev-page-action.c		\
 	ev-page-action.h		\
+	ev-page-action-widget.c		\
+	ev-page-action-widget.h		\
 	ev-page-cache.h			\
 	ev-page-cache.c			\
 	ev-password.h			\
@@ -75,54 +48,51 @@ 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-open-recent-action.c		\
+	ev-open-recent-action.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-attachments.c	\
+	ev-sidebar-attachments.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)
-
-if ENABLE_METADATA
-evince_SOURCES += \
-	ev-metadata-manager.h		\
-	ev-metadata-manager.c
-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/toolbar-editor/libtoolbareditor.la	\
-	$(top_builddir)/properties/libevproperties.la			\
-	$(top_builddir)/lib/libev.la					\
-	-ltiff -lz							\
-	libevbackendfactory.la						\
-	$(NULL)
-
-if ENABLE_DBUS
-evince_LDADD += $(DBUS_LIBS)
-endif
+	ev-timeline.c			\
+	ev-timeline.h			\
+	ev-tooltip.c			\
+	ev-tooltip.h			\
+	ev-transition-animation.c	\
+	ev-transition-animation.h	\
+	main.c
+
+evince_LDADD=									\
+	$(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la			\
+	$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la		\
+	$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la	\
+	$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la	\
+	$(top_builddir)/properties/libevproperties.la				\
+	$(top_builddir)/libdocument/libevbackend.la				\
+	$(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
@@ -130,14 +100,24 @@ if ENABLE_DBUS
 BUILT_SOURCES += ev-application-service.h
 endif
 
-EXTRA_DIST = ev-marshal.list
+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
 
-ev-application-service.h: ev-application-service.xml
+DISTCLEANFILES= \
+	ev-application-service.h
+
+if DBUS_TOOL_NO_PREFIX
+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: $(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