Build libmonoutils and link it to the binaries that need it.

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

diff --git a/configure.in b/configure.in
index 15b5404c9e8b573b1885d4e46a33998ec282b244..91efbd2fd13e3d307c9e1d488a9e3c5575f6e868 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -460,6 +460,7 @@ AC_SUBST(CFLAGS)
 AC_OUTPUT([
 Makefile
 mono/Makefile
+mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
@@ -485,4 +486,4 @@ echo "
 
        GC:     $gc
 
-"
\ No newline at end of file
+"

diff --git a/mono/Makefile.am b/mono/Makefile.am
index 75a6be2d90a2437e84de4fc06a53cb593d71fd7e..7f5bdb732cec1bacfd3c82e71c7dc70ea3644294 100644 (file)
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -1,9 +1,9 @@
 # Currently the jit needs some work before it will build on windows
 if PLATFORM_WIN32
-SUBDIRS = io-layer monoburg metadata cil dis \
+SUBDIRS = utils io-layer monoburg metadata cil dis \
        arch monograph interpreter wrapper tests
 else
-SUBDIRS = io-layer monoburg metadata cil dis \
+SUBDIRS = utils io-layer monoburg metadata cil dis \
        arch monograph interpreter jit wrapper tests
 endif
 

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 2e36ea8d865124010369fc014be354dd3bbb363f..7cf51142868d63eff9056f097ea318c8c872d65c 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -22,6 +22,7 @@ monodis_LDADD =                       \
        libmonodis.a                    \
        ../metadata/libmetadata.a       \
        ../io-layer/libwapi.a           \
+       ../utils/libmonoutils.a         \
        $(GMODULE_LIBS)                 \
        $(GLIB_LIBS) 
 

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index b43f9588190fe3f1c53564a4d9525335d2644ad0..c66c5bcc0346cc94a6c6c3bc8cdc8a382ba63712 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -14,6 +14,7 @@ mint_LDADD =                          \
        ../arch/libmonoarch.la  \
        ../metadata/libmetadata.a       \
        ../io-layer/libwapi.a   \
+       ../utils/libmonoutils.a         \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 609ad6e013c7a643fd9fc1a8041de1b347c8105d..e5fbfdda1371df1de22bdd581fda9c643e485238 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -78,6 +78,6 @@ libmetadatainclude_HEADERS = \
 pedump_SOURCES =               \
        pedump.c $(libmetadata_a_SOURCES)
 
-pedump_LDADD = $(GLIB_LIBS) $(GMODULE_LIBS) ../io-layer/libwapi.a -lm
+pedump_LDADD = ../io-layer/libwapi.a ../utils/libmonoutils.a $(GLIB_LIBS) $(GMODULE_LIBS) -lm
 
 

diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index 7ab0c74e36d342b7c9cf7e27c9d54db104da28bf..5c1feb7e7394a8011808ecd0465ced32e791b4df 100644 (file)
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES =                              \
 monograph_LDADD = \
        ../metadata/libmetadata.a       \
        ../io-layer/libwapi.a           \
+       ../utils/libmonoutils.a         \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm