projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 fa533db2d2c671bdc0a99e3eaa1bd140595afadb..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)         \
@@ -54,8 +54,6 @@ export HOST_CC
 PLATFORM_CFLAGS = -O
 endif
 
-PLATFORM_LIB = ../os/libmonoos.la
-
 # hack for automake to have the same source file in a library and a bin
 genmdesc_CFLAGS = $(AM_CFLAGS)
 
@@ -95,7 +93,6 @@ endif
 
 mono_LDADD = \
        $(MONO_LIB)                     \
-       $(PLATFORM_LIB)         \
        $(GLIB_LIBS)            \
        $(GMODULE_LIBS) -lm     \
        $(ICU_LIBS)
@@ -111,7 +108,6 @@ genmdesc_SOURCES = \
 # Don't link this against libmonoruntime to speed up rebuilds
 genmdesc_LDADD = \
        $(monodir)/mono/utils/libmonoutils.la $(monodir)/mono/metadata/opcodes.lo -lm   \
-       $(PLATFORM_LIB)         \
        $(GLIB_LIBS)            \
        $(GMODULE_LIBS)
 
@@ -177,6 +173,8 @@ ia64_sources = \
 common_sources = \
        mini.c          \
        mini.h          \
+       jit-icalls.h \
+       jit-icalls.c \
        trace.c         \
        trace.h         \
        mini-ops.h      \
@@ -194,17 +192,19 @@ common_sources = \
        ssapre.h        \
        aliasing.c      \
        aliasing.h      \
-       ssapre-cee-ops.h \
-       ssapre-mini-ops.h \
+       local-propagation.c     \
+       simple-cee-ops.h \
+       simple-mini-ops.h \
        driver.c        \
        debug-mini.c    \
-       debug-debugger.c\
        linear-scan.c   \
-       aot.c           \
+       aot-compiler.c          \
+       aot-runtime.c           \
        graph.c         \
        mini-exceptions.c       \
        declsec.c       \
        declsec.h       \
+       wapihandles.c   \
        branch-opts.c
 
 test_sources =                 \
@@ -220,31 +220,36 @@ 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
+else
+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)
-
+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)
+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
@@ -254,59 +259,60 @@ 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)
 nodist_libmono_static_la_SOURCES = $(nodist_libmono_la_SOURCES)
 libmono_static_la_LDFLAGS = -static
-libmono_static_la_LIBADD = $(static_libs) $(PLATFORM_LIB)
+libmono_static_la_LIBADD = $(static_libs)
 
 BURGSRC= $(common_BURGSRC) $(arch_BURGSRC)
 
@@ -315,8 +321,7 @@ libmonoincludedir = $(includedir)/mono/jit
 libmonoinclude_HEADERS = jit.h
 
 libmono_la_LIBADD = \
-       $(libs) \
-       $(PLATFORM_LIB)
+       $(libs)
 
 %.exe: %.2.cs TestDriver.dll
        $(GMCS) -out:$@ $< -r:TestDriver.dll 
@@ -324,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=$@ $<
 
@@ -431,7 +439,7 @@ BUILT_SOURCES= inssel.c inssel.h $(arch_built)
 endif
 
 CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
-EXTRA_DIST = $(common_BURGSRC) jit-icalls.c cprop.c TestDriver.cs ldscript ldscript.mono \
+EXTRA_DIST = $(common_BURGSRC) cprop.c TestDriver.cs ldscript ldscript.mono \
        $(test_sources) $(test_sources2) \
        inssel-long.brg inssel-long32.brg \
        $(x86_sources) inssel-x86.brg cpu-pentium.md \
my mono mirror. check out Moved to http://github.com/mono/mono