X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Finterpreter%2FMakefile.am;h=4cea04452be5d3ff2c4dbe80ed96306b2705895d;hb=95405ddfdf12ac4a6fc71845d931599a9fad2c1f;hp=576a0a6bc6da08ccc3ed6ff8889572a4b66b2838;hpb=0abc2e6270020edc4a5b4c66f93b4ae582815f20;p=mono.git diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am index 576a0a6bc6d..4cea04452be 100644 --- 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 @@ -47,16 +48,12 @@ 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) \ $(GLIB_LIBS) \ - $(GMODULE_LIBS) \ + $(LIBICONV) \ $(ICU_LIBS) \ -lm -man_MANS = mint.1 - EXTRA_DIST = $(man_MANS)