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=0175b5a22805ca791b34ce0a354ce1369b98b0fd;hb=03a4afa9aeab342a63530db46888e405ea1c8afc;hp=65d3ffad8eb4fb420a04d0185ef4cfbaf75758e5;hpb=5adc9f2e1a99e29b8a761388e17c08a6e4d79d5d;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 65d3ffad..0175b5a2 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES=							\
 	-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/evmountoperation/		\
 	-I$(top_srcdir)/cut-n-paste/smclient/			\
 	-I$(top_srcdir)/libdocument				\
 	-I$(top_builddir)/libdocument				\
@@ -86,13 +85,18 @@ evince_SOURCES=				\
 	ev-sidebar-thumbnails.h		\
 	main.c
 
+evince_LDFLAGS = $(AM_LDFLAGS)
+
+if PLATFORM_WIN32
+evince_LDFLAGS += -mwindows
+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/evmountoperation/libevmountoperation.la		\
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la				\
 	$(top_builddir)/properties/libevproperties.la					\
 	$(top_builddir)/libdocument/libevdocument.la					\
@@ -112,19 +116,14 @@ EXTRA_DIST = ev-marshal.list		\
 
 
 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