From 90bb210e1e68af0d3d45cad5f1c5d70ced85d822 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 3 Nov 2001 23:19:25 +0000 Subject: [PATCH] On Win32, create separate .exp file for module-test.o and link with that. 2001-11-04 Tor Lillqvist * tests/Makefile.am: On Win32, create separate .exp file for module-test.o and link with that. Otherwise the GNU linker doesn't export the g_clash_func. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ tests/Makefile.am | 7 ++++++- 9 files changed, 54 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2e0bb43f..6d0d52ca 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-11-04 Tor Lillqvist + + * tests/Makefile.am: On Win32, create separate .exp file for + module-test.o and link with that. Otherwise the GNU linker doesn't + export the g_clash_func. + 2001-11-03 Hans Breuer * glib/giowin32.c : static correctness diff --git a/tests/Makefile.am b/tests/Makefile.am index 022b05bf..94b26b82 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,6 +11,11 @@ if PLATFORM_WIN32 libadd_libgmodule = $(libgmodule) libadd_libglib = $(libglib) no_undefined = -no-undefined + +module_test_exp = module-test.exp + +module-test.exp: module-test.o + dlltool --output-exp module-test.exp module-test.o endif EXTRA_DIST = \ @@ -105,7 +110,7 @@ iochannel_test_LDADD = $(progs_LDADD) list_test_LDADD = $(progs_LDADD) mainloop_test_LDADD = $(thread_LDADD) markup_test_LDADD = $(progs_LDADD) -module_test_LDADD = $(module_LDADD) +module_test_LDADD = $(module_LDADD) $(module_test_exp) module_test_LDFLAGS = @G_MODULE_LDFLAGS@ node_test_LDADD = $(progs_LDADD) queue_test_LDADD = $(progs_LDADD) -- 2.34.1