X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=0175b5a22805ca791b34ce0a354ce1369b98b0fd;hb=cc3f21efc8104182171c9300facc16d9a79177ef;hp=3bdfee891d4f3a1cbc8ed982cf754f9c737e53cd;hpb=13a06349251874bd35d2f03c3fc93217cee749a2;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 3bdfee89..0175b5a2 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,69 +1,72 @@
-INCLUDES=						\
-	-DDATADIR=\"$(pkgdatadir)\"			\
-	-DGNOMEDATADIR=\"$(datadir)\"			\
-	-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)/libdocument			\
-	-I$(top_srcdir)/properties			\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
-	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
-	$(SHELL_CFLAGS)					\
-	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED)				\
-	$(GNOME_PRINT_CFLAGS)				\
-	$(GTK_PRINT_CFLAGS)
+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)
 
-if HAVE_GTK_RECENT
-INCLUDES +=
+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
-INCLUDES += -I$(top_srcdir)/cut-n-paste/recent-files/
+DBUS_SOURCES = $(null)
 endif
 
-bin_PROGRAMS=evince
-
 evince_SOURCES=				\
 	eggfindbar.c			\
 	eggfindbar.h			\
 	ev-application.c		\
 	ev-application.h		\
-	ev-job-queue.h			\
-	ev-job-queue.c			\
-	ev-jobs.h			\
-	ev-jobs.c			\
+	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-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			\
-	ev-password.c			\
 	ev-password-view.h		\
 	ev-password-view.c		\
-	ev-pixbuf-cache.c		\
-	ev-pixbuf-cache.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-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		\
@@ -72,52 +75,34 @@ evince_SOURCES=				\
 	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-stock-icons.c		\
-	ev-stock-icons.h		\
-	ev-tooltip.c			\
-	ev-tooltip.h			\
 	main.c
 
+evince_LDFLAGS = $(AM_LDFLAGS)
 
-if WITH_GNOME_PRINT
-evince_SOURCES+=			\
-	ev-print-job.c			\
-	ev-print-job.h
-endif
-
-
-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)/properties/libevproperties.la			\
-	$(top_builddir)/libdocument/libevbackend.la			\
-	$(SHELL_LIBS)							\
-	$(GNOME_PRINT_LIBS)
-
-if HAVE_GTK_RECENT
-evince_LDADD +=
-else
-evince_LDADD += $(top_builddir)/cut-n-paste/recent-files/librecent.la
+if PLATFORM_WIN32
+evince_LDFLAGS += -mwindows
 endif
 
-if ENABLE_DJVU
-evince_LDADD +=	$(DJVU_LIBS)
-endif
-
-if ENABLE_DVI
-evince_LDADD +=	-lkpathsea
-endif
-
-if WITH_TYPE1_FONTS
-evince_LDADD += -lt1
-endif
+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
 
@@ -126,23 +111,19 @@ 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: $(srcdir)/ev-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
+	$(AM_V_GEN)$(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 $(srcdir)/ev-marshal.list --body >> ev-marshal.c
+	$(AM_V_GEN)$(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
-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
+	$(AM_V_GEN)dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml