2004-08-16 Zoltan Varga <vargaz@freemail.hu>

	* Makefile.am: Link the static versions of the convenience libraries
	into the mono executable.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index d8fc8be31a1b373a60d4b4f359250359a896c94a..67d536a58e66886f3d0c94b0200916fcbe3526a0 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-16  Zoltan Varga  <vargaz@freemail.hu>
 
+       * Makefile.am: Link the static versions of the convenience libraries
+       into the mono executable.
+
        * mini-x86.h mini-x86.c: Throw the correct exception on integer overflow.
 
 2004-08-15  Zoltan Varga  <vargaz@freemail.hu>

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 7ad8f575b51a4f5069a5c8c1e378fda9c44fe2b1..ffc124cc1566ba305e7f13af9e4226ea085c9f82 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -11,6 +11,16 @@ libs=        \
        $(LIBGC_LIBS)   \
        $(ICU_LIBS)
 
+static_libs=   \
+       $(monodir)/mono/metadata/libmonoruntime-static.la       \
+       $(monodir)/mono/metadata/libmetadata-static.la  \
+       $(monodir)/mono/io-layer/libwapi.la     \
+       $(monodir)/mono/utils/libmonoutils.la \
+       $(GMODULE_LIBS) \
+       $(GLIB_LIBS)    \
+       $(LIBGC_LIBS)   \
+       $(ICU_LIBS)
+
 MCS=mcs
 RUNTIME=mono
 
@@ -43,6 +53,7 @@ bin_PROGRAMS = mono
 noinst_PROGRAMS = genmdesc
 
 lib_LTLIBRARIES = libmono.la
+noinst_LTLIBRARIES = libmono-static.la
 endif
 
 mono_SOURCES = \
@@ -51,10 +62,10 @@ mono_SOURCES = \
 if AMD64
 # Link libmono into mono statically on platforms where it is possible
 # This leads to higher performance, especially with TLS
-MONO_LIB=.libs/libmono.a
+MONO_LIB=libmono-static.la
 else 
 if X86
-MONO_LIB=.libs/libmono.a
+MONO_LIB=libmono-static.la
 else
 MONO_LIB=libmono.la
 endif
@@ -214,6 +225,11 @@ endif
 
 nodist_libmono_la_SOURCES = inssel.c inssel.h
 
+libmono_static_la_SOURCES = $(libmono_la_SOURCES)
+nodist_libmono_static_la_SOURCES = $(nodist_libmono_la_SOURCES)
+libmono_static_la_LDFLAGS = -static
+libmono_static_la_LIBADD = $(static_libs)
+
 BURGSRC= $(common_BURGSRC) $(arch_BURGSRC)
 
 libmonoincludedir = $(includedir)/mono/jit