[mcs] Revert to broken native csc definite assignment for structs

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

diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index 1abcdeb86b1616a5e5ffa1567fdf09a18e726ce0..4cea04452be5d3ff2c4dbe80ed96306b2705895d 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -1,20 +1,23 @@
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
-       $(LIBGC_CFLAGS)                 \
-       $(GMODULE_CFLAGS)               \
+       $(LIBGC_CPPFLAGS)               \
        $(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
 AM_CFLAGS = -O
 endif
 
+if INTERP_SUPPORTED
 bin_PROGRAMS = mint
 
 lib_LTLIBRARIES = libmint.la
 
+man_MANS = mint.1
+endif
+
 mint_SOURCES =         \
        main.c
 
@@ -30,24 +33,27 @@ libmint_la_SOURCES =        \
        mintops.c       \
        transform.c
 
-libmintincludedir = $(includedir)/mono/interpreter
+libmintincludedir = $(includedir)/mono-$(API_VER)/mono/interpreter
 
 libmintinclude_HEADERS =       \
        embed.h
 
+# This is needed for automake dependency generation
+if INCLUDED_LIBGC
+libgc_libs=../../libgc/libmonogc.la
+else
+libgc_libs=$(LIBGC_LIBS)
+endif
+
 libmint_la_LIBADD =                            \
        ../arch/libmonoarch.la          \
        ../metadata/libmonoruntime.la   \
-       ../metadata/libmetadata.la      \
        ../io-layer/libwapi.la          \
        ../utils/libmonoutils.la        \
-       ../os/libmonoos.la              \
-       $(LIBGC_LIBS)                   \
+       $(libgc_libs)                   \
        $(GLIB_LIBS)                    \
-       $(GMODULE_LIBS)                 \
+       $(LIBICONV)                     \
        $(ICU_LIBS)                     \
        -lm
 
-man_MANS = mint.1
-
 EXTRA_DIST = $(man_MANS)