2010-06-23 Miguel de Icaza <miguel@novell.com>

	* configure.in: First pass at supporting the compilation of both

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 11a2bd7117fce56742fac8048ec705b95f698b86..3c8bd487ea568d0fe2d48826f96147f11b86e539 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-23  Miguel de Icaza  <miguel@novell.com>
 
+       * Makefile.am: Make the file a bit more consistent.
+
        * debug-debugger.c: Wrap the entire file with an #ifdef
        MONO_DEBUGGER_SUPPORTED to simplify the build.
 
@@ -11,7 +13,7 @@
        debugger supports Boehm, but not Sgen, this simplifies the build. 
 
        * Renamed the *.s files into *.S
-       
+
 2010-06-23  Zoltan Varga  <vargaz@gmail.com>
 
        * mini.h (MONO_INS_HAS_NO_SIDE_EFFECT): Add OP_LDADDR.

diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index f72721b27324e8898ead4a1993ad7b8a9aef4c3d..df10c498ce25e0828ae3bfa26cdd5b948243b709 100644 (file)
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -287,10 +287,10 @@ common_sources = \
        simd-intrinsics.c       \
        mini-unwind.h           \
        unwind.c                \
-       image-writer.h  \
-       image-writer.c  \
-       dwarfwriter.h   \
-       dwarfwriter.c   \
+       image-writer.h          \
+       image-writer.c          \
+       dwarfwriter.h           \
+       dwarfwriter.c           \
        mini-gc.h               \
        mini-gc.c               \
        debugger-agent.h        \
@@ -578,21 +578,21 @@ endif
 
 CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
 EXTRA_DIST = $(common_BURGSRC) TestDriver.cs ldscript ldscript.mono \
-       genmdesc.pl     \
-       $(test_sources) \
-       $(x86_sources) cpu-x86.md \
-       $(amd64_sources) cpu-amd64.md \
-       $(ppc_sources) cpu-ppc.md cpu-ppc64.md \
-       $(arm_sources) cpu-arm.md \
-       $(mips_sources) cpu-mips.md \
-       $(sparc_sources) cpu-sparc.md \
-       $(s390_sources) cpu-s390.md \
-       $(s390x_sources) cpu-s390x.md \
-       $(ia64_sources) cpu-ia64.md \
-       $(alpha_sources) cpu-alpha.md \
-       $(hppa_sources) cpu-hppa.md     \
-       $(windows_sources)              \
-       $(darwin_sources) Info.plist    \
+       genmdesc.pl                             \
+       $(test_sources)                         \
+       $(x86_sources) cpu-x86.md               \
+       $(amd64_sources) cpu-amd64.md           \
+       $(ppc_sources) cpu-ppc.md cpu-ppc64.md  \
+       $(arm_sources) cpu-arm.md               \
+       $(mips_sources) cpu-mips.md             \
+       $(sparc_sources) cpu-sparc.md           \
+       $(s390_sources) cpu-s390.md             \
+       $(s390x_sources) cpu-s390x.md           \
+       $(ia64_sources) cpu-ia64.md             \
+       $(alpha_sources) cpu-alpha.md           \
+       $(hppa_sources) cpu-hppa.md             \
+       $(windows_sources)                      \
+       $(darwin_sources) Info.plist            \
        $(posix_sources)
 
 version.h: Makefile