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 a9d259f63c5b2c3c967032abaad1cf84cf428bd0..747aa8756348d2812b14e31bfba4d80918814ce9 100644 (file)
--- 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 f9de1e4586063db48eb46a336415933ab47500a0..e7d6248262de6a9b6d7cc0bbe4a414f3b58dd98e 100644 (file)
--- 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 5f9b65d1fcbc7953709910ccff081a2629bfefe8..b3c8560c6fa5a394025ec9ed6ccabf2c205edb9e 100644 (file)
--- 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 f8997ee1e4f4be8f9b86b6a5067ade182c6a38ff..9c032e5335498dd590427207ea8cd29ebd4b13ab 100644 (file)
--- 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 98a8b6309d693d3ba4af2a8e27436c53bd6d78fa..3512aa7885d48edbe638f9c4a7d0c43d5681fa7d 100644 (file)
--- 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  \