X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2FMakefile.am;h=32e231637aa2df36ceda2699042fec2c5ce24112;hb=dcdd5a25d92ca46ae14f74e974b4def640920e33;hp=73d25fdfe2e0a42ee30964b6cd893b30fc41ccd3;hpb=08d43c51a795b055eae41866fea658aec4b8d1e4;p=mono.git

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 73d25fdfe2e..32e231637aa 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,34 +1,40 @@
-noinst_PROGRAMS = pedump
+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
 
-lib_LIBRARIES = libmetadata.a
+bin_PROGRAMS = monosn pedump
 
-#
-# Keep in sync with mono/runtime/Makefile.am
-#
-assembliesdir = $(libdir)
+noinst_LTLIBRARIES = libmetadata.la libmonoruntime.la
 
-INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)	\
-	-DMONO_ASSEMBLIES=\""$(assembliesdir)"\"		
 
-libmetadata_a_SOURCES = \
-	assembly.c	\
-	opcodes.c	\
-	image.c		\
-	metadata.c	\
-	verify.c	\
-	mono-endian.c	\
-	private.h	\
-	rawbuffer.c	\
+INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)	-I$(top_srcdir)/mono \
+	-DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+
+libmonoruntime_la_SOURCES = \
 	reflection.c	\
-	loader.c	\
-	class.c		\
 	object.c	\
 	icall.c		\
 	decimal.c	\
 	decimal.h	\
+	gc.c		\
+	gc-internal.h	\
+	marshal.c	\
+	marshal.h	\
+	monitor.c	\
+	monitor.h	\
 	threads.c	\
-	threads.h	\
-	threads-types.h	\
+	threadpool.c	\
 	file-io.c	\
 	file-io.h	\
 	socket-io.c	\
@@ -37,12 +43,56 @@ libmetadata_a_SOURCES = \
 	exception.h	\
 	unicode.c	\
 	unicode.h	\
-	mempool.h	\
+	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		\
+	rand.c		\
+	string-icalls.c \
+	string-icalls.h \
+	sysmath.h	\
+	sysmath.c	\
+	process.c	\
+	process.h	\
+	environment.c	\
+	environment.h
+
+libmetadata_la_SOURCES = \
+	assembly.c	\
+	domain.c	\
+	opcodes.c	\
+	image.c		\
+	metadata.c	\
+	verify.c	\
+	mono-endian.c	\
+	mono-config.c	\
+	mono-config.h	\
+	private.h	\
+	rawbuffer.c	\
+	loader.c	\
+	class.c		\
 	mempool.c	\
-	appdomain.h	\
-	appdomain.c
+	debug-helpers.c
 
 libmetadataincludedir = $(includedir)/mono/metadata
+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
 
 libmetadatainclude_HEADERS = \
 	assembly.h	\
@@ -62,11 +112,23 @@ libmetadatainclude_HEADERS = \
 	class.h		\
 	object.h	\
 	exception.h	\
-	appdomain.h
+	profiler.h	\
+	appdomain.h	\
+	debug-helpers.h	\
+	mempool.h	\
+	rand.h
 
 pedump_SOURCES =		\
-	pedump.c $(libmetadata_a_SOURCES)
+	pedump.c
+
+pedump_LDADD = libmetadata.la ../io-layer/libwapi.la ../utils/libmonoutils.la $(GLIB_LIBS) $(GMODULE_LIBS) -lm
 
-pedump_LDADD = $(GLIB_LIBS) $(GMODULE_LIBS) ../io-layer/libwapi.a
 
+monosn_LDADD = \
+	../metadata/libmetadata.la	\
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la	\
+	$(GLIB_LIBS)			\
+	$(GMODULE_LIBS) 		\
+	-lm