2007-10-11 Mark Probst <mark.probst@gmail.com>

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 3feba0ef287c8ca43191c50afabee4cd8795b131..6ff2368895bb0dc87158f4d05b6a93f9be1aab0e 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,20 +1,19 @@
 if PLATFORM_WIN32
-export HOST_CC
 # Use -m here. This will use / as directory separator (C:/WINNT).
 # The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the
 # / by \ if running under WIN32.
 assembliesdir = `cygpath -m "${libdir}"`
 confdir = `cygpath -m "${sysconfdir}"`
+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
-PLATFORM_LIB = ../os/libmonoos.la
 else
-assembliesdir = $(libdir)
+assembliesdir = $(exec_prefix)/lib
 confdir = $(sysconfdir)
 endif
 
-bin_PROGRAMS = pedump monodiet
+bin_PROGRAMS = pedump
 
 #
 # libtool is not capable of creating static/shared versions of the same
@@ -22,9 +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) $(ICU_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,36 +36,41 @@ 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 \
        threads.c       \
        threads-types.h \
        threadpool.c    \
        threadpool.h    \
+       threadpool-internals.h  \
        file-io.c       \
        file-io.h       \
        socket-io.c     \
        socket-io.h     \
        exception.c     \
        exception.h     \
-       unicode.c       \
-       unicode.h       \
        appdomain.c     \
        debug-mono-symfile.h    \
        debug-mono-symfile.c    \
@@ -82,6 +84,8 @@ libmonoruntime_la_SOURCES = \
        rand.c          \
        security.c      \
        security.h      \
+       security-core-clr.c     \
+       security-core-clr.h     \
        string-icalls.c \
        string-icalls.h \
        sysmath.h       \
@@ -92,6 +96,7 @@ libmonoruntime_la_SOURCES = \
        environment.h   \
        locales.c       \
        locales.h       \
+       normalization-tables.h  \
        filewatcher.c   \
        filewatcher.h   \
        culture-info.h  \
@@ -106,19 +111,18 @@ libmonoruntime_la_SOURCES = \
        opcodes.c       \
        image.c         \
        cil-coff.h      \
-       tabledefs.h     \
        metadata.c      \
        metadata-internals.h    \
        verify.c        \
        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
 
@@ -126,13 +130,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   \
@@ -151,6 +155,7 @@ libmonoruntimeinclude_HEADERS = \
        exception.h     \
        profiler.h      \
        appdomain.h     \
+       mono-config.h   \
        debug-helpers.h \
        mempool.h
 
@@ -158,21 +163,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
-
-monodiet_SOURCES = monodiet.c
-
-monodiet_LDADD = \
-       libmonoruntime.la       \
-       ../io-layer/libwapi.la          \
-       ../utils/libmonoutils.la        \
-       $(PLATFORM_LIB)                 \
-       $(LIBGC_LIBS)                   \
-       $(GLIB_LIBS)                    \
-       $(GMODULE_LIBS)                 \
-       $(ICU_LIBS)                     \
-       -lm
+       $(LIBGC_LIBS) $(GLIB_LIBS) -lm
 
 EXTRA_DIST = make-bundle.pl sample-bundle