r16809 - gnucash/trunk/src/gnc-module - #505895: Fix make check on win32 in src/gnc-module.

[Andreas Köhler]

Author: andi5
Date: 2008-01-05 09:05:04 -0500 (Sat, 05 Jan 2008)
New Revision: 16809
Trac: http://svn.gnucash.org/trac/changeset/16809

Modified:
   gnucash/trunk/src/gnc-module/gnc-module.c
   gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
Log:
#505895: Fix make check on win32 in src/gnc-module.

Compile test modules with -avoid-version, just like the productive ones.


Modified: gnucash/trunk/src/gnc-module/gnc-module.c
===================================================================
--- gnucash/trunk/src/gnc-module/gnc-module.c	2008-01-05 12:16:11 UTC (rev 16808)
+++ gnucash/trunk/src/gnc-module/gnc-module.c	2008-01-05 14:05:04 UTC (rev 16809)
@@ -269,6 +269,8 @@
   g_return_val_if_fail(symbol, FALSE);
 
   /* Separate the file from its extension */
+  /* Note: This currently does not work with versioned libtool dlls,
+   * as they are named like libgncmodbaz-0.dll */
   basename = g_path_get_basename(g_module_name(gmodule));
   strs = g_strsplit(basename, ".", 2);
   g_free(basename);

Modified: gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am	2008-01-05 12:16:11 UTC (rev 16808)
+++ gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am	2008-01-05 14:05:04 UTC (rev 16809)
@@ -10,18 +10,18 @@
 check_LTLIBRARIES=libfuturemodsys.la libincompatdep.la libagedver.la
 
 libfuturemodsys_la_SOURCES=futuremodsys.c
-libfuturemodsys_la_LDFLAGS=-rpath ${PWD}
+libfuturemodsys_la_LDFLAGS=-rpath ${PWD} -avoid-version
 libfuturemodsys_la_LIBADD = \
   $(GLIB_LIBS)
 
 libincompatdep_la_SOURCES=incompatdep.c
-libincompatdep_la_LDFLAGS=-module -rpath ${PWD}
+libincompatdep_la_LDFLAGS=--rpath ${PWD} -avoid-version
 libincompatdep_la_LIBADD = \
   ../../libgnc-module.la \
   $(GLIB_LIBS)
 
 libagedver_la_SOURCES=agedver.c
-libagedver_la_LDFLAGS=-rpath ${PWD}
+libagedver_la_LDFLAGS=-rpath ${PWD} -avoid-version
 libagedver_la_LIBADD = \
   $(GLIB_LIBS)
 

Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2008-01-05 12:16:11 UTC (rev 16808)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2008-01-05 14:05:04 UTC (rev 16809)
@@ -17,7 +17,7 @@
   swig-bar.c
 
 libgncmodbar_la_SOURCES=gnc-mod-bar.c
-libgncmodbar_la_LDFLAGS=-rpath ${PWD}
+libgncmodbar_la_LDFLAGS=-rpath ${PWD} -avoid-version
 libgncmodbar_la_LIBADD=libbar.la \
   $(GUILE_LIBS) \
   $(GLIB_LIBS)

Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2008-01-05 12:16:11 UTC (rev 16808)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2008-01-05 14:05:04 UTC (rev 16809)
@@ -19,7 +19,7 @@
   swig-baz.c
 
 libgncmodbaz_la_SOURCES = gnc-mod-baz.c
-libgncmodbaz_la_LDFLAGS = -rpath ${PWD}
+libgncmodbaz_la_LDFLAGS = -rpath ${PWD} -avoid-version
 libgncmodbaz_la_LIBADD = \
   libbaz.la \
   ../../libgnc-module.la \

Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2008-01-05 12:16:11 UTC (rev 16808)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2008-01-05 14:05:04 UTC (rev 16809)
@@ -17,7 +17,7 @@
   swig-foo.c
 
 libgncmodfoo_la_SOURCES = gnc-mod-foo.c
-libgncmodfoo_la_LDFLAGS = -rpath ${PWD}
+libgncmodfoo_la_LDFLAGS = -rpath ${PWD} -avoid-version
 libgncmodfoo_la_LIBADD = \
   libfoo.la \
   $(GUILE_LIBS) \