Simplify 'make all' build.

[mono.git] / mono / mini / Makefile.am

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 7ad8f575b51a4f5069a5c8c1e378fda9c44fe2b1..d5ab154ea546252194c5fa45e8bab0098d120ec6 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,11 +18,23 @@ libs=        \
        $(monodir)/mono/utils/libmonoutils.la \
        $(GMODULE_LIBS) \
        $(GLIB_LIBS)    \
-       $(LIBGC_LIBS)   \
+       $(libgc_libs)   \
        $(ICU_LIBS)
 
-MCS=mcs
-RUNTIME=mono
+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_static_libs) \
+       $(ICU_LIBS)
+
+RUNTIME = $(LIBTOOL) --mode=execute ./mono --config $(top_builddir)/data/config
+
+MCS = MONO_PATH=$(mcs_topdir)/class/lib/default $(RUNTIME) $(mcs_topdir)/class/lib/default/mcs.exe --unsafe -nowarn:0162
+ILASM = MONO_PATH=$(mcs_topdir)/class/lib/default $(RUNTIME) $(mcs_topdir)/ilasm/ilasm.exe
 
 INCLUDES = \
        -I$(top_srcdir)         \
@@ -35,7 +57,12 @@ monoldflags=
 else
 monoldflags=-Wl,-version-script=$(srcdir)/ldscript
 endif
+
+if PLATFORM_WIN32
+libmono_la_LDFLAGS=-no-undefined -version-info 1:0:0 $(monoldflags)
+else
 libmono_la_LDFLAGS=$(monoldflags)
+endif
 
 if JIT_SUPPORTED
 bin_PROGRAMS = mono
@@ -43,22 +70,19 @@ bin_PROGRAMS = mono
 noinst_PROGRAMS = genmdesc
 
 lib_LTLIBRARIES = libmono.la
+noinst_LTLIBRARIES = libmono-static.la
 endif
 
 mono_SOURCES = \
        main.c
 
-if AMD64
-# Link libmono into mono statically on platforms where it is possible
+if STATIC_MONO
+# Link libmono into mono statically
 # 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
-else
 MONO_LIB=libmono.la
 endif
-endif
 
 mono_LDADD = \
        $(MONO_LIB)                     \
@@ -74,8 +98,9 @@ genmdesc_SOURCES = \
        genmdesc.c      \
        helpers.c
 
+# Don't link this against libmetadata to speed up rebuilds
 genmdesc_LDADD = \
-       $(libs) -lm     \
+       $(monodir)/mono/utils/libmonoutils.la $(monodir)/mono/metadata/opcodes.lo -lm   \
        $(GLIB_LIBS)            \
        $(GMODULE_LIBS)
 
@@ -138,7 +163,9 @@ common_sources = \
        debug-mini.c    \
        linear-scan.c   \
        aot.c           \
-       graph.c 
+       graph.c         \
+       declsec.c       \
+       declsec.h
 
 test_sources =                 \
        basic-calls.cs  \
@@ -214,6 +241,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
@@ -227,7 +259,7 @@ libmono_la_LIBADD = \
        $(MCS) /out:$*.exe /unsafe $< /r:TestDriver.dll
 
 %.exe: %.il
-       ilasm /output=$*.exe $<
+       $(ILASM) /output=$*.exe $<
 
 TestDriver.dll: $(srcdir)/TestDriver.cs
        $(MCS) /out:TestDriver.dll /target:library $(srcdir)/TestDriver.cs
@@ -289,7 +321,9 @@ stat3: mono bench.exe
 docu: mini.sgm
        docbook2txt mini.sgm
 
-clean:
+check-local: rcheck
+
+clean-local:
        rm -f mono a.out gmon.out *.o test.exe
 
 pkgconfigdir = $(libdir)/pkgconfig