2006-08-13 Atsushi Enomoto <atsushi@ximian.com>

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index da1839fc6f6ec7f4f00c18bb11ba8a624c32b488..647ad3e72ada364250f1b91fcf1eae43a20c17bd 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,12 +1,18 @@
 if PLATFORM_WIN32
+# 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
+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
+assembliesdir = $(exec_prefix)/lib
+confdir = $(sysconfdir)
 endif
 
-PLATFORM_LIB = ../os/libmonoos.la 
-
 bin_PROGRAMS = pedump monodiet
 
 #
@@ -15,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)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.
@@ -31,7 +36,7 @@ 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    \
@@ -43,6 +48,8 @@ libmonoruntime_la_SOURCES = \
        decimal.h       \
        boehm-gc.c      \
        null-gc.c       \
+       sgen-gc.c       \
+       sgen-gc.h       \
        gc.c            \
        gc-internal.h   \
        marshal.c       \
@@ -86,6 +93,7 @@ libmonoruntime_la_SOURCES = \
        environment.h   \
        locales.c       \
        locales.h       \
+       normalization-tables.h  \
        filewatcher.c   \
        filewatcher.h   \
        culture-info.h  \
@@ -125,7 +133,6 @@ libmonoruntimeinclude_HEADERS = \
        appdomain.h     \
        mono-debug.h    \
        mono-gc.h       \
-       mono-debug-debugger.h   \
        debug-mono-symfile.h    \
        threads.h       \
        environment.h   \
@@ -151,7 +158,6 @@ 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
@@ -160,7 +166,6 @@ monodiet_LDADD = \
        libmonoruntime.la       \
        ../io-layer/libwapi.la          \
        ../utils/libmonoutils.la        \
-       $(PLATFORM_LIB)                 \
        $(LIBGC_LIBS)                   \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \