2003-04-24 Martin Baulig <martin@ximian.com>

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 1a4b2ba8078cf856e925e58cfe67bf180a9a04a3..32e231637aa2df36ceda2699042fec2c5ce24112 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,20 +1,25 @@
 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}"`
+# 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 = $(libdir)
+confdir = $(sysconfdir)
 endif
 
-bin_PROGRAMS = monosn
-
-noinst_PROGRAMS = pedump
+bin_PROGRAMS = monosn pedump
 
 noinst_LTLIBRARIES = libmetadata.la libmonoruntime.la
 
-#
-# Keep in sync with mono/runtime/Makefile.am
-#
-assembliesdir = $(libdir)
 
 INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)    -I$(top_srcdir)/mono \
-       -DMONO_ASSEMBLIES=\""$(assembliesdir)"\" -DMONO_CFG_DIR=\""$(sysconfdir)"\"
+       -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 libmonoruntime_la_SOURCES = \
        reflection.c    \
@@ -26,6 +31,8 @@ libmonoruntime_la_SOURCES = \
        gc-internal.h   \
        marshal.c       \
        marshal.h       \
+       monitor.c       \
+       monitor.h       \
        threads.c       \
        threadpool.c    \
        file-io.c       \
@@ -39,6 +46,10 @@ libmonoruntime_la_SOURCES = \
        appdomain.c     \
        debug-mono-symfile.h    \
        debug-mono-symfile.c    \
+       mono-debug.h            \
+       mono-debug.c            \
+       mono-debug-debugger.h   \
+       mono-debug-debugger.c   \
        profiler.c      \
        profiler-private.h      \
        rand.h          \
@@ -48,7 +59,9 @@ libmonoruntime_la_SOURCES = \
        sysmath.h       \
        sysmath.c       \
        process.c       \
-       process.h
+       process.h       \
+       environment.c   \
+       environment.h
 
 libmetadata_la_SOURCES = \
        assembly.c      \
@@ -72,9 +85,14 @@ libmonoruntimeincludedir = $(includedir)/mono/metadata
 
 libmonoruntimeinclude_HEADERS = \
        appdomain.h     \
+       mono-debug.h    \
+       mono-debug-debugger.h   \
+       debug-mono-symfile.h    \
        threadpool.h    \
        threads-types.h \
-       threads.h
+       threads.h       \
+       environment.h   \
+       monitor.h
 
 libmetadatainclude_HEADERS = \
        assembly.h      \