2004-01-19 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 5b4da2522eca29a8bb5509d4043e327f4989b418..c8ea367f2a196612ab322a83ddebdbf5d38a0ef9 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,21 +1,33 @@
 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 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)"\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(ICU_CFLAGS) \
+       -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+
+if WITH_BUNDLE
+bundle_srcs = mono-bundle.s mono-bundle.h
+mono-bundle.s mono-bundle.h: $(BUNDLE_FILE) $(srcdir)/make-bundle.pl
+       perl $(srcdir)/make-bundle.pl $(BUNDLE_FILE) mono-bundle.h mono-bundle.s
+else
+bundle_srcs =
+endif
 
 libmonoruntime_la_SOURCES = \
        reflection.c    \
@@ -42,6 +54,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          \
@@ -53,7 +69,11 @@ libmonoruntime_la_SOURCES = \
        process.c       \
        process.h       \
        environment.c   \
-       environment.h
+       environment.h   \
+       locales.c       \
+       locales.h       \
+       filewatcher.c   \
+       filewatcher.h
 
 libmetadata_la_SOURCES = \
        assembly.c      \
@@ -70,6 +90,7 @@ libmetadata_la_SOURCES = \
        loader.c        \
        class.c         \
        mempool.c       \
+       $(bundle_srcs)  \
        debug-helpers.c
 
 libmetadataincludedir = $(includedir)/mono/metadata
@@ -77,12 +98,15 @@ 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       \
        environment.h   \
-       monitor.h
+       monitor.h       \
+       locales.h
 
 libmetadatainclude_HEADERS = \
        assembly.h      \
@@ -111,14 +135,20 @@ libmetadatainclude_HEADERS = \
 pedump_SOURCES =               \
        pedump.c
 
-pedump_LDADD = libmetadata.la ../io-layer/libwapi.la ../utils/libmonoutils.la $(GLIB_LIBS) $(GMODULE_LIBS) -lm
+pedump_LDADD = libmetadata.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
+       $(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
 
 
 monosn_LDADD = \
-       ../metadata/libmetadata.la      \
+       libmetadata.la  \
        ../io-layer/libwapi.la          \
        ../utils/libmonoutils.la        \
+       $(LIBGC_LIBS)                   \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \
        -lm
 
+BUILT_SOURCES = $(bundle_srcs)
+
+EXTRA_DIST = make-bundle.pl sample-bundle
+