Link with the libgmodule la only on Win32.

2001-03-12  Tor Lillqvist  <tml@iki.fi>

	* tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
	libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
	on Win32.

2001-03-12  Tor Lillqvist  <tml@iki.fi>

	* Makefile.am (libgplugin_a_la_LIBADD, libgplugin_b_la_LIBADD):
	Link with the libgmodule la only on Win32.

diff --git a/ChangeLog b/ChangeLog
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 31b9f76..9d5fbad 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/Makefile.am (libmoduletestplugin_b_la_LIBADD,
+       libmoduletestplugin_b_la_LIBADD): Link with the libgmodule la only
+       on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * glibconfig.h.win32.in: Define G_PLATFORM_WIN32 here, too.

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 2404ec1..a3d05d7 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-12  Tor Lillqvist  <tml@iki.fi>
+
+       * Makefile.am (libgplugin_a_la_LIBADD, libgplugin_b_la_LIBADD):
+       Link with the libgmodule la only on Win32.
+
 2001-03-10  Tor Lillqvist  <tml@iki.fi>
 
        * Makefile.am: Use the _LIBADD dependency on libglib only on the

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index b724fae..a6838b9 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -36,6 +36,7 @@ lib_LTLIBRARIES = libgmodule-1.3.la libgplugin_a.la libgplugin_b.la
 
 if PLATFORM_WIN32
 libadd_libglib = $(libglib)
+libadd_libgmodule = libgmodule-1.3.la
 no_undefined = -no-undefined
 endif
 if OS_WIN32
@@ -52,11 +53,11 @@ libgmodule_1_3_la_LIBADD = @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libadd_libgli
 
 libgplugin_a_la_SOURCES = libgplugin_a.c
 libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libadd_libglib)
+libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
 
 libgplugin_b_la_SOURCES = libgplugin_b.c
 libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ libgmodule-1.3.la $(libadd_libglib)
+libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_PLUGIN_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
 
 noinst_PROGRAMS = testgmodule
 testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5029d51..b4dce61 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,7 @@ libgmodule = $(top_builddir)/gmodule/libgmodule-1.3.la
 libgobject = $(top_builddir)/gobject/libgobject-1.3.la
 
 if PLATFORM_WIN32
+libadd_libgmodule = $(libgmodule)
 libadd_libglib = $(libglib)
 no_undefined = -no-undefined
 endif
@@ -91,11 +92,11 @@ install-libLTLIBRARIES:
 
 libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
 libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
-libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libgmodule) $(libadd_libglib)
+libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
 
 libmoduletestplugin_b_la_SOURCES = libmoduletestplugin_b.c
 libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
-libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libgmodule) $(libadd_libglib)
+libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
 
 makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
        cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status