* 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 89d26ddd96553b7583689dada2eff3fdba293b1f..7e68b7f9e7cb2734c33b9b089a521d4bee4b4e74 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -5,16 +5,14 @@ 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
 
-PLATFORM_LIB = ../os/libmonoos.la 
-
 bin_PROGRAMS = pedump monodiet
 
 #
@@ -23,8 +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_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.
@@ -39,22 +36,27 @@ assembly.lo mono-config.lo: Makefile
 
 CLEANFILES = mono-bundle.stamp
 
-libmonoruntime_static_la_LIBADD = $(bundle_obj) $(PLATFORM_LIB) $(libmonoruntime_la_LIBADD)
+libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
 
 libmonoruntime_la_SOURCES = \
        reflection.c    \
        object.c        \
        object-internals.h      \
        icall.c         \
+       icall-def.h             \
        char-conversions.h \
        decimal.c       \
        decimal.h       \
        boehm-gc.c      \
        null-gc.c       \
+       sgen-gc.c       \
+       sgen-gc.h       \
        gc.c            \
        gc-internal.h   \
        marshal.c       \
        marshal.h       \
+       mono-mlist.c    \
+       mono-mlist.h    \
        monitor.c       \
        monitor.h       \
        tabledefs.h \
@@ -69,8 +71,6 @@ libmonoruntime_la_SOURCES = \
        socket-io.h     \
        exception.c     \
        exception.h     \
-       unicode.c       \
-       unicode.h       \
        appdomain.c     \
        debug-mono-symfile.h    \
        debug-mono-symfile.c    \
@@ -94,6 +94,7 @@ libmonoruntime_la_SOURCES = \
        environment.h   \
        locales.c       \
        locales.h       \
+       normalization-tables.h  \
        filewatcher.c   \
        filewatcher.h   \
        culture-info.h  \
@@ -114,12 +115,12 @@ libmonoruntime_la_SOURCES = \
        mono-endian.c   \
        mono-endian.h   \
        mono-config.c   \
-       mono-config.h   \
        rawbuffer.c     \
        rawbuffer.h     \
        loader.c        \
        class.c         \
        class-internals.h               \
+       wrapper-types.h         \
        mempool.c       \
        debug-helpers.c
 
@@ -127,13 +128,13 @@ 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      \
        appdomain.h     \
        mono-debug.h    \
        mono-gc.h       \
-       mono-debug-debugger.h   \
        debug-mono-symfile.h    \
        threads.h       \
        environment.h   \
@@ -152,6 +153,7 @@ libmonoruntimeinclude_HEADERS = \
        exception.h     \
        profiler.h      \
        appdomain.h     \
+       mono-config.h   \
        debug-helpers.h \
        mempool.h
 
@@ -159,8 +161,7 @@ pedump_SOURCES =            \
        pedump.c
 
 pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
-       $(PLATFORM_LIB)                 \
-       $(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
+       $(LIBGC_LIBS) $(GLIB_LIBS) -lm
 
 monodiet_SOURCES = monodiet.c
 
@@ -168,10 +169,8 @@ monodiet_LDADD = \
        libmonoruntime.la       \
        ../io-layer/libwapi.la          \
        ../utils/libmonoutils.la        \
-       $(PLATFORM_LIB)                 \
        $(LIBGC_LIBS)                   \
        $(GLIB_LIBS)                    \
-       $(GMODULE_LIBS)                 \
        $(ICU_LIBS)                     \
        -lm