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=0262c37b31e566b4a1857096dadf3fe908675922;hb=776a6fe02961d8901d21e172633d3c8d1c85dc93;hp=ae0129017df89dcc4889b2e34a215f0b9fb0ce84;hpb=9a1a3b315f05568f6e28f64f685338dc120d5491;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index ae012901..0262c37b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,80 +1,104 @@
-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)/properties			\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
-	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
-	$(SHELL_CFLAGS)					\
-	$(WARN_CFLAGS)					\
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
+
+INCLUDES=							\
+	-DDATADIR=\"$(pkgdatadir)\"				\
+	-DGNOMEDATADIR=\"$(datadir)\"				\
+	-I$(top_srcdir)						\
+	-I$(top_builddir)					\
+	-I$(top_srcdir)/cut-n-paste/zoom-control/		\
+	-I$(top_srcdir)/cut-n-paste/toolbar-editor/		\
+	-I$(top_srcdir)/cut-n-paste/totem-screensaver/		\
+	-I$(top_srcdir)/cut-n-paste/gedit-message-area/		\
+	-I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/	\
+	-I$(top_srcdir)/cut-n-paste/smclient/			\
+	-I$(top_srcdir)/libdocument				\
+	-I$(top_builddir)/libdocument				\
+	-I$(top_srcdir)/libview					\
+	-I$(top_builddir)/libview				\
+	-I$(top_srcdir)/libmisc					\
+	-I$(top_srcdir)/properties				\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
+	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
+	-DEVINCE_COMPILATION					\
+	$(SHELL_CFLAGS)						\
+	$(WARN_CFLAGS)						\
 	$(DISABLE_DEPRECATED)
 
 bin_PROGRAMS=evince
 
+EV_MEDIA_PLAYER_KEYS_SOURCES = ev-media-player-keys.c ev-media-player-keys.h
+if ENABLE_DBUS
+DBUS_SOURCES = $(EV_MEDIA_PLAYER_KEYS_SOURCES)
+else
+DBUS_SOURCES = $(null)
+endif
+
 evince_SOURCES=				\
 	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-file-monitor.h		\
+	ev-file-monitor.c		\
+	ev-history.c			\
+	ev-history.h			\
+	ev-keyring.h			\
+	ev-keyring.c			\
 	ev-marshal.c			\
 	ev-marshal.h			\
+	$(DBUS_SOURCES)			\
+	ev-message-area.c		\
+	ev-message-area.h		\
 	ev-metadata-manager.c		\
 	ev-metadata-manager.h		\
-	ev-page-action.c		\
-	ev-page-action.h		\
-	ev-page-cache.h			\
-	ev-page-cache.c			\
-	ev-password.h			\
-	ev-password.c			\
+	ev-navigation-action.c		\
+	ev-navigation-action.h		\
+	ev-navigation-action-widget.c	\
+	ev-navigation-action-widget.h	\
 	ev-password-view.h		\
 	ev-password-view.c		\
-	ev-pixbuf-cache.c		\
-	ev-pixbuf-cache.h		\
-	ev-print-job.c			\
-	ev-print-job.h			\
+	ev-print-operation.h		\
+	ev-print-operation.c		\
+	ev-progress-message-area.h	\
+	ev-progress-message-area.c	\
 	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.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-layers.c		\
+	ev-sidebar-layers.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
 
-evince_LDADD=								\
-	$(SHELL_LIBS)							\
-	$(top_builddir)/cut-n-paste/recent-files/librecent.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
+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)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la	\
+	$(top_builddir)/cut-n-paste/smclient/libsmclient.la				\
+	$(top_builddir)/properties/libevproperties.la					\
+	$(top_builddir)/libdocument/libevdocument.la					\
+	$(top_builddir)/libview/libevview.la						\
+	$(top_builddir)/libmisc/libevmisc.la						\
+	$(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
@@ -83,23 +107,24 @@ BUILT_SOURCES += ev-application-service.h
 endif
 
 EXTRA_DIST = ev-marshal.list		\
-	ev-application-service.xml
+	ev-application-service.xml	\
+	$(EV_MEDIA_PLAYER_KEYS_SOURCES)
 
 
-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
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
 
-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
+ev-marshal.c: $(srcdir)/ev-marshal.list
+	$(QUIET_GEN)echo '#include "ev-marshal.h"' > 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: $(srcdir)/ev-application-service.xml
-	dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+	$(QUIET_GEN)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
+	$(QUIET_GEN)dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
 endif