2008-05-07 Robert Jordan <robertj@gmx.net>

	* Makefile.am: don't pull libeglib.a twice. Fixes #387491.

svn path=/trunk/mono/; revision=102706

diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog
index 8310d003025a60129475ee5a51d44a7590804520..a1bef1e13d47021f2320c5186f154341876a77ac 100644 (file)
--- a/mono/tests/ChangeLog
+++ b/mono/tests/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-07  Robert Jordan  <robertj@gmx.net>
+
+       * Makefile.am: don't pull libeglib.a twice. Fixes #387491.
+
 2008-05-05  Robert Jordan  <robertj@gmx.net>
 
        * libtest.c, thunks.cs: reworked to match the new struct

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 94a470dcc4bac3ccb2d3c7665bd41889e7155636..c97d2fba0a8275e298547dcdcf434ccc7730505f 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1,5 +1,12 @@
 SUBDIRS = cas assemblyresolve
 
+# avoid including eglib twice since GLIB_LIBS == GMODULE_LIBS for eglib builds
+if EGLIB_BUILD
+glib_libs = $(GLIB_LIBS)
+else
+glib_libs = $(GLIB_LIBS) $(GMODULE_LIBS)
+endif
+
 check-local: test
 
 TEST_PROG = ../interpreter/mint
@@ -732,6 +739,6 @@ else
 libtest_la_LDFLAGS = -rpath `pwd`
 endif
 libtest_la_SOURCES = libtest.c
-libtest_la_LIBADD = $(GLIB_LIBS) $(GMODULE_LIBS)
+libtest_la_LIBADD = $(glib_libs)
 
 CLEANFILES = $(TESTSI_CS) $(TESTSI_IL) $(STRESS_TESTS) *.dll *.stdout *.exe stest.dat