From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Thu, 8 Sep 2005 10:52:09 +0000 (+0000)
Subject: Some build fixes for cygwin. Patch by yselkowitz@users.sourceforge.net
X-Git-Tag: EVINCE_0_5_0~174
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=e92df77b024c5a757d223ea2ca79583c338036b9;p=evince.git

Some build fixes for cygwin. Patch by yselkowitz@users.sourceforge.net

2005-09-08  Marco Pesenti Gritti  <mpg@redhat.com>

        * dvi/Makefile.am:
        * properties/Makefile.am:
        * shell/Makefile.am:
        * thumbnailer/Makefile.am:

        Some build fixes for cygwin. Patch by yselkowitz@users.sourceforge.net
---

diff --git a/ChangeLog b/ChangeLog
index a9d259f6..747aa875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-09-08  Marco Pesenti Gritti  <mpg@redhat.com>
+
+	* dvi/Makefile.am:
+	* properties/Makefile.am:
+	* shell/Makefile.am:
+	* thumbnailer/Makefile.am:
+
+	Some build fixes for cygwin. Patch by yselkowitz@users.sourceforge.net
+
 2005-09-08  Marco Pesenti Gritti  <mpg@redhat.com>
 
 	* shell/ev-sidebar-links.c: (ev_sidebar_links_class_init),
diff --git a/dvi/Makefile.am b/dvi/Makefile.am
index f9de1e45..e7d62482 100644
--- a/dvi/Makefile.am
+++ b/dvi/Makefile.am
@@ -2,9 +2,9 @@ SUBDIRS = mdvi-lib
 
 INCLUDES = \
 	-I$(top_srcdir)						\
-	-I$(top_srcdir)/backend					\
+	-I$(top_srcdir)/backend				\
 	-I$(top_srcdir)/lib					\
-	-I./mdvi-lib						\
+	-I$(srcdir)/mdvi-lib				\
 	$(LIB_CFLAGS)
 
 noinst_LTLIBRARIES = libgtkdvi.la
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 5f9b65d1..b3c8560c 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -27,7 +27,9 @@ libevince_properties_page_la_SOURCES = 	\
 	ev-properties-main.c
 
 libevince_properties_page_la_LIBADD = 		\
-	$(FRONTEND_LIBS)			\
-	$(NAUTILUS_LIBS)			\
 	$(top_builddir)/lib/libev.la		\
-	libevproperties.la
+	libevproperties.la			\
+	$(FRONTEND_LIBS)			\
+	$(NAUTILUS_LIBS)
+
+libevince_properties_page_la_LDFLAGS = -module -avoid-version -no-undefined
diff --git a/shell/Makefile.am b/shell/Makefile.am
index f8997ee1..9c032e53 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -67,12 +67,12 @@ evince_SOURCES=				\
 	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
+	$(top_builddir)/lib/libev.la	\
+	$(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 98a8b630..3512aa78 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -16,8 +16,8 @@ evince_thumbnailer_SOURCES=	\
 	evince-thumbnailer.c
 
 evince_thumbnailer_LDADD=				\
-	$(FRONTEND_LIBS)				\
-	$(top_builddir)/lib/libev.la
+	$(top_builddir)/lib/libev.la	\
+	$(FRONTEND_LIBS)
 
 schema_files = \
 	evince-thumbnailer-dvi.schemas.in  \