2009-12-26 Rodrigo Kumpera <rkumpera@novell.com>

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

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index 6cc37bd8211d0eed1e7c0b1fbc80980e9a9cc0a8..4485b35c2c0268141c6a6e9cd3470d0216d29398 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -37,11 +37,12 @@ AM_CFLAGS = \
        -I$(top_srcdir)         \
        $(LIBGC_CFLAGS)         \
        $(GLIB_CFLAGS)          \
+       $(LLVM_CFLAGS)          \
        $(PLATFORM_CFLAGS) $(ARCH_CFLAGS)
 
 AM_CXXFLAGS = $(LLVM_CXXFLAGS) $(GLIB_CFLAGS)
 
-if PLATFORM_WIN32
+if HOST_WIN32
 export HOST_CC
 # The mingw math.h has "extern inline" functions that dont appear in libs, so
 # optimisation is required to actually inline them
@@ -59,7 +60,7 @@ monoldflags=-Wl,-version-script=$(srcdir)/ldscript $(export_ldflags)
 monobinldflags=-Wl,-version-script=$(srcdir)/ldscript.mono $(export_ldflags)
 endif
 
-if PLATFORM_WIN32
+if HOST_WIN32
 libmono_la_LDFLAGS=-no-undefined -avoid-version -Wl,--kill-at $(monoldflags)
 else
 libmono_la_LDFLAGS=$(monoldflags)
@@ -67,7 +68,7 @@ endif
 
 if JIT_SUPPORTED
 
-if PLATFORM_WIN32
+if HOST_WIN32
 bin_PROGRAMS = mono monow
 else
 bin_PROGRAMS = mono
@@ -133,7 +134,7 @@ mono-dtrace.$(OBJEXT): $(top_srcdir)/data/mono.d mini.lo $(monodir)/mono/metadat
 endif
 
 # Create monow.exe, linked for the 'windows' subsystem
-if PLATFORM_WIN32
+if HOST_WIN32
 monow_LDADD = $(mono_LDADD)
 monow_LDFLAGS = $(mono_LDFLAGS) -mwindows
 monow_SOURCES = $(mono_SOURCES)
@@ -225,10 +226,9 @@ posix_sources = \
        mini-posix.c
 
 if ENABLE_LLVM
-# Disabled for now to fix the windows build
-#llvm_sources = \
-#      mini-llvm.c             \
-#      mini-llvm-cpp.cpp
+llvm_sources = \
+       mini-llvm.c             \
+       mini-llvm-cpp.cpp
 endif
 
 common_sources = \
@@ -278,14 +278,16 @@ common_sources = \
        tasklets.c              \
        tasklets.h              \
        simd-intrinsics.c       \
-       unwind.h                \
+       mini-unwind.h           \
        unwind.c                \
        image-writer.h  \
        image-writer.c  \
        dwarfwriter.h   \
        dwarfwriter.c   \
        mini-gc.h               \
-       mini-gc.c
+       mini-gc.c               \
+       debugger-agent.h \
+       debugger-agent.c
 
 test_sources =                         \
        basic-calls.cs          \
@@ -404,7 +406,7 @@ arch_built = cpu-hppa.h
 arch_define=__hppa__
 endif
 
-if PLATFORM_WIN32
+if HOST_WIN32
 os_sources = $(windows_sources)
 monobin_platform_ldflags=
 endif
@@ -563,7 +565,7 @@ BUILT_SOURCES = version.h
 endif
 
 CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
-EXTRA_DIST = $(common_BURGSRC) cprop.c TestDriver.cs ldscript ldscript.mono \
+EXTRA_DIST = $(common_BURGSRC) TestDriver.cs ldscript ldscript.mono \
        genmdesc.pl     \
        $(test_sources) \
        $(x86_sources) cpu-x86.md \
@@ -578,7 +580,7 @@ EXTRA_DIST = $(common_BURGSRC) cprop.c TestDriver.cs ldscript ldscript.mono \
        $(alpha_sources) cpu-alpha.md \
        $(hppa_sources) cpu-hppa.md     \
        $(windows_sources)              \
-       $(darwin_sources)               \
+       $(darwin_sources) Info.plist    \
        $(posix_sources)
 
 version.h: Makefile
@@ -599,3 +601,6 @@ version.h: Makefile
 patch-libtool:
        sed -e 's,if (for obj in $$oldobjs,if (for obj in "",g' < ../../libtool > 2; mv 2 ../../libtool
        chmod a+x ../../libtool
+
+tags:
+       etags -o TAGS `find .. -name "*.h" -o -name "*.c"`