[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 cf8f2efaa62d0d6c5ddb0a4db7efe38aaa976378..4cea04452be5d3ff2c4dbe80ed96306b2705895d 100644 (file)
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -1,10 +1,9 @@
-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
@@ -15,6 +14,8 @@ if INTERP_SUPPORTED
 bin_PROGRAMS = mint
 
 lib_LTLIBRARIES = libmint.la
+
+man_MANS = mint.1
 endif
 
 mint_SOURCES =         \
@@ -32,7 +33,7 @@ libmint_la_SOURCES =  \
        mintops.c       \
        transform.c
 
-libmintincludedir = $(includedir)/mono/interpreter
+libmintincludedir = $(includedir)/mono-$(API_VER)/mono/interpreter
 
 libmintinclude_HEADERS =       \
        embed.h
@@ -51,10 +52,8 @@ libmint_la_LIBADD =                          \
        ../utils/libmonoutils.la        \
        $(libgc_libs)                   \
        $(GLIB_LIBS)                    \
-       $(GMODULE_LIBS)                 \
+       $(LIBICONV)                     \
        $(ICU_LIBS)                     \
        -lm
 
-man_MANS = mint.1
-
 EXTRA_DIST = $(man_MANS)