* class-internals.h: Removed "MonoClass.interface_offsets" as a first

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 1bfcbdac9d7f1edc884310a48d4c8389c5dd8ec9..7e68b7f9e7cb2734c33b9b089a521d4bee4b4e74 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -5,10 +5,10 @@ if PLATFORM_WIN32
 assembliesdir = `cygpath -m "${libdir}"`
 confdir = `cygpath -m "${sysconfdir}"`
 export HOST_CC
-else
 # The mingw math.h has "extern inline" functions that dont appear in libs, so
 # optimisation is required to actually inline them
 AM_CFLAGS = -O
+else
 assembliesdir = $(exec_prefix)/lib
 confdir = $(sysconfdir)
 endif
@@ -21,7 +21,7 @@ bin_PROGRAMS = pedump monodiet
 #
 noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.
@@ -55,6 +55,8 @@ libmonoruntime_la_SOURCES = \
        gc-internal.h   \
        marshal.c       \
        marshal.h       \
+       mono-mlist.c    \
+       mono-mlist.h    \
        monitor.c       \
        monitor.h       \
        tabledefs.h \
@@ -118,6 +120,7 @@ libmonoruntime_la_SOURCES = \
        loader.c        \
        class.c         \
        class-internals.h               \
+       wrapper-types.h         \
        mempool.c       \
        debug-helpers.c
 
@@ -125,7 +128,7 @@ libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
 
 libmonoruntime_static_la_LDFLAGS = -static
 
-libmonoruntimeincludedir = $(includedir)/mono/metadata
+libmonoruntimeincludedir = $(includedir)/mono-$(API_VER)/mono/metadata
 
 libmonoruntimeinclude_HEADERS = \
        attrdefs.h      \
@@ -158,7 +161,7 @@ pedump_SOURCES =            \
        pedump.c
 
 pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
-       $(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
+       $(LIBGC_LIBS) $(GLIB_LIBS) -lm
 
 monodiet_SOURCES = monodiet.c
 
@@ -168,7 +171,6 @@ monodiet_LDADD = \
        ../utils/libmonoutils.la        \
        $(LIBGC_LIBS)                   \
        $(GLIB_LIBS)                    \
-       $(GMODULE_LIBS)                 \
        $(ICU_LIBS)                     \
        -lm