2004-10-29 Zoltan Varga <vargaz@freemail.hu>

	* Makefile.am (libgc_libs): Do some automake magic so libmono/mono
	depends on libmonogc. Fixes #68805.

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

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index 5c9f953b7f5cdf943e4e26fe952d6d86a40c53ba..6098647035d04c62641f55db41cc6ea9a2d6780e 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-29  Zoltan Varga  <vargaz@freemail.hu>
+
+       * Makefile.am (libgc_libs): Do some automake magic so libmono/mono
+       depends on libmonogc.
 
 Wed Sep 22 19:06:02 CEST 2004 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index 1abcdeb86b1616a5e5ffa1567fdf09a18e726ce0..3c8a9d17aa6f8417ee7f0f64780bf7603aa95b79 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -35,6 +35,13 @@ libmintincludedir = $(includedir)/mono/interpreter
 libmintinclude_HEADERS =       \
        embed.h
 
+# This is needed for automake dependency generation
+if INCLUDED_LIBGC
+libgc_libs=../../libgc/libmonogc.la
+else
+libgc_libs=$(LIBGC_LIBS)
+endif
+
 libmint_la_LIBADD =                            \
        ../arch/libmonoarch.la          \
        ../metadata/libmonoruntime.la   \
@@ -42,7 +49,7 @@ libmint_la_LIBADD =                           \
        ../io-layer/libwapi.la          \
        ../utils/libmonoutils.la        \
        ../os/libmonoos.la              \
-       $(LIBGC_LIBS)                   \
+       $(libgc_libs)                   \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        $(ICU_LIBS)                     \

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index ab13b2adfe26a6917687e8b7ceec5ac0f4125662..35571c5a6043606a94da70ddd59caac3d4d1ea20 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-29  Zoltan Varga  <vargaz@freemail.hu>
+
+       * Makefile.am (libgc_libs): Do some automake magic so libmono/mono
+       depends on libmonogc. Fixes #68805.
+
 2004-10-26  Miguel de Icaza  <miguel@ximian.com>
 
        * mini.c (mono_jit_free_method): Provide extra information for

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 643aeca15c37f675ea22dd9d0ea0db0201344d0d..749d36c5c7689acab7c818fdff313a0191ca8401 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -1,6 +1,16 @@
 count=100000
 mtest=for_loop
 monodir=$(top_builddir)
+
+# This is needed for automake dependency generation
+if INCLUDED_LIBGC
+libgc_libs=$(monodir)/libgc/libmonogc.la
+libgc_static_libs=$(monodir)/libgc/libmonogc-static.la
+else
+libgc_libs=$(LIBGC_LIBS)
+libgc_static_libs=$(LIBGC_STATIC_LIBS)
+endif
+
 libs=  \
        $(monodir)/mono/metadata/libmonoruntime.la      \
        $(monodir)/mono/metadata/libmetadata.la \
@@ -8,7 +18,7 @@ libs=  \
        $(monodir)/mono/utils/libmonoutils.la \
        $(GMODULE_LIBS) \
        $(GLIB_LIBS)    \
-       $(LIBGC_LIBS)   \
+       $(libgc_libs)   \
        $(ICU_LIBS)
 
 static_libs=   \
@@ -18,7 +28,7 @@ static_libs=  \
        $(monodir)/mono/utils/libmonoutils.la \
        $(GMODULE_LIBS) \
        $(GLIB_LIBS)    \
-       $(LIBGC_STATIC_LIBS)    \
+       $(libgc_static_libs) \
        $(ICU_LIBS)
 
 MCS=mcs