2006-06-20 Jb Evain <jbevain@gmail.com>

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

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 76b3251e4ef3edf1f5793909d908b696231501fe..d0decf49b44dd00da05f988859c9f5bb02c1e114 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -38,7 +38,7 @@ RUNTIME2 = MONO_PATH=$(CLASS2) $(top_builddir)/runtime/mono-wrapper
 MCS = $(RUNTIME) $(CLASS1)/mcs.exe -unsafe -nowarn:0162
 GMCS = $(RUNTIME2) $(CLASS2)/gmcs.exe -unsafe -nowarn:0162
 ILASM = $(RUNTIME) $(CLASS1)/ilasm.exe
-
+ILASM2 = $(RUNTIME2) $(CLASS2)/ilasm.exe
 
 AM_CFLAGS = \
        -I$(top_srcdir)         \
@@ -193,12 +193,13 @@ common_sources = \
        aliasing.c      \
        aliasing.h      \
        local-propagation.c     \
-       ssapre-cee-ops.h \
-       ssapre-mini-ops.h \
+       simple-cee-ops.h \
+       simple-mini-ops.h \
        driver.c        \
        debug-mini.c    \
        linear-scan.c   \
-       aot.c           \
+       aot-compiler.c          \
+       aot-runtime.c           \
        graph.c         \
        mini-exceptions.c       \
        declsec.c       \
@@ -219,7 +220,7 @@ test_sources =              \
        iltests.il              \
        test.cs
 
-test_sources2 = generics.2.cs
+test_sources2 = generics.2.cs il2tests.2.il
 
 if MONO_DEBUGGER_SUPPORTED
 mono_debugger_sources = debug-debugger.c debug-debugger.h
@@ -228,28 +229,27 @@ mono_debugger_sources =
 endif
 
 regtests=basic.exe arrays.exe basic-float.exe basic-math.exe basic-long.exe objects.exe basic-calls.exe iltests.exe exceptions.exe bench.exe
-regtests2=generics.exe
+regtests2=generics.exe il2tests.exe
+
 common_BURGSRC= $(srcdir)/inssel.brg $(srcdir)/inssel-float.brg
 
 if X86
-libmono_la_SOURCES = \
-       $(common_sources) $(x86_sources) $(mono_debugger_sources)
-
+arch_sources = \
+       $(x86_sources) $(mono_debugger_sources)
 arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-x86.brg
 arch_built=cpu-pentium.h
 endif
 
 if AMD64
-libmono_la_SOURCES = \
-       $(common_sources) $(amd64_sources) $(mono_debugger_sources)
+arch_sources = \
+       $(amd64_sources) $(mono_debugger_sources)
 arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-amd64.brg
 arch_built=cpu-amd64.h
 endif
 
 if POWERPC
-libmono_la_SOURCES = \
-       $(common_sources) $(ppc_sources)
-
+arch_sources = \
+       $(ppc_sources)
 arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-ppc.brg
 arch_built=cpu-g4.h
 endif
@@ -259,53 +259,54 @@ if ARM
 # pick up arm_dpimacros.h and arm_fpamacros.h
 ARCH_CFLAGS = -I../arch/arm
 
-libmono_la_SOURCES = \
-       $(common_sources) $(arm_sources)
+arch_sources = $(arm_sources)
 
 arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-arm.brg
 arch_built=cpu-arm.h
 endif
 
 if SPARC
-libmono_la_SOURCES = \
-       $(common_sources) $(sparc_sources)
+arch_sources = \
+       $(sparc_sources)
 
 arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-sparc.brg
 arch_built=cpu-sparc.h
 endif
 
 if SPARC64
-libmono_la_SOURCES = \
-       $(common_sources) $(sparc_sources)
+arch_sources = \
+       $(sparc_sources)
 
 arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-sparc.brg
 arch_built=cpu-sparc.h
 endif
 
 if S390
-libmono_la_SOURCES = \
-       $(common_sources) $(s390_sources)
+arch_sources = \
+       $(s390_sources)
 
 arch_BURGSRC= $(srcdir)/inssel-long32.brg $(srcdir)/inssel-s390.brg
 arch_built=cpu-s390.h
 endif
 
 if S390x
-libmono_la_SOURCES = \
-       $(common_sources) $(s390x_sources)
+arch_sources = \
+       $(s390x_sources)
 
 arch_BURGSRC= $(srcdir)/inssel-long.brg $(srcdir)/inssel-s390x.brg
 arch_built=cpu-s390x.h
 endif
 
 if IA64
-libmono_la_SOURCES = \
-    $(common_sources) $(ia64_sources)
+arch_sources = \
+    $(ia64_sources)
 
 arch_BURGSRC = $(srcdir)/inssel-long.brg $(srcdir)/inssel-ia64.brg
 arch_built = cpu-ia64.h
 endif
 
+libmono_la_SOURCES = $(common_sources) $(arch_sources)
+
 nodist_libmono_la_SOURCES = inssel.c inssel.h
 
 libmono_static_la_SOURCES = $(libmono_la_SOURCES)
@@ -328,6 +329,9 @@ libmono_la_LIBADD = \
 %.exe: %.cs TestDriver.dll
        $(MCS) -out:$@ -unsafe $< -r:TestDriver.dll
 
+%.exe: %.2.il
+       $(ILASM2) -output=$@ $<
+
 %.exe: %.il
        $(ILASM) -output=$@ $<