X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2FMakefile.am;h=48e228bbaeaf81e1c39226a3a383d3bf07cec879;hb=669beaed8380fa592533c8755f72593b4422d01d;hp=cf7237190c63b8a53dbf43114c9f5d271b90d627;hpb=6dde46c6f5bd19b74155aad46b711b59a6d0e78b;p=mono.git

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index cf7237190c6..48e228bbaea 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,52 +1,87 @@
 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
-assembliesdir = `cygpath -w "${libdir}" | sed -e 's@\\\\@\\\\\\\\@g'`
-confdir = `cygpath -w "${sysconfdir}" | sed -e 's@\\\\@\\\\\\\\@g'`
+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
-else
-assembliesdir = $(libdir)
+assembliesdir = $(exec_prefix)/lib
 confdir = $(sysconfdir)
 endif
 
-bin_PROGRAMS = monosn pedump
+bin_PROGRAMS = pedump monodiet
+
+#
+# libtool is not capable of creating static/shared versions of the same
+# convenience lib, so we have to do it ourselves
+#
+noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
 
-noinst_LTLIBRARIES = libmetadata.la libmonoruntime.la
+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.
+#
+#  assembly.c uses MONO_ASSEMBLIES
+#  mono-config.c uses MONO_CFG_DIR
+#
+# This won't result in many more false positives than AC_DEFINEing them
+# in configure.in.
+#
+assembly.lo mono-config.lo: Makefile
 
-INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)	-I$(top_srcdir)/mono \
-	-DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+CLEANFILES = mono-bundle.stamp
+
+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	\
 	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	\
+	mono-debug.h		\
+	mono-debug.c		\
+	mono-debug-debugger.h	\
+	mono-debug-debugger.c	\
 	profiler.c	\
 	profiler-private.h	\
 	rand.h		\
 	rand.c		\
+	security.c	\
+	security.h	\
 	string-icalls.c \
 	string-icalls.h \
 	sysmath.h	\
@@ -54,50 +89,60 @@ libmonoruntime_la_SOURCES = \
 	process.c	\
 	process.h	\
 	environment.c	\
-	environment.h
-
-libmetadata_la_SOURCES = \
+	environment.h	\
+	locales.c	\
+	locales.h	\
+	normalization-tables.h	\
+	filewatcher.c	\
+	filewatcher.h	\
+	culture-info.h  \
+	culture-info-tables.h	\
+	security-manager.c	\
+	security-manager.h	\
+	console-io.c		\
+	console-io.h	\
 	assembly.c	\
 	domain.c	\
+	domain-internals.h	\
 	opcodes.c	\
 	image.c		\
+	cil-coff.h	\
 	metadata.c	\
+	metadata-internals.h	\
 	verify.c	\
 	mono-endian.c	\
+	mono-endian.h	\
 	mono-config.c	\
 	mono-config.h	\
-	private.h	\
 	rawbuffer.c	\
+	rawbuffer.h	\
 	loader.c	\
 	class.c		\
+	class-internals.h		\
 	mempool.c	\
 	debug-helpers.c
 
-libmetadataincludedir = $(includedir)/mono/metadata
+libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
+
+libmonoruntime_static_la_LDFLAGS = -static
+
 libmonoruntimeincludedir = $(includedir)/mono/metadata
 
 libmonoruntimeinclude_HEADERS = \
 	appdomain.h	\
+	mono-debug.h	\
+	mono-gc.h	\
 	debug-mono-symfile.h	\
-	threadpool.h	\
-	threads-types.h	\
 	threads.h	\
 	environment.h	\
-	monitor.h
-
-libmetadatainclude_HEADERS = \
 	assembly.h	\
 	opcodes.h	\
 	blob.h		\
-	cil-coff.h	\
-	mono-endian.h	\
 	image.h		\
 	metadata.h	\
 	verify.h	\
-	rawbuffer.h	\
 	reflection.h	\
 	row-indexes.h	\
-	tabledefs.h	\
 	tokentype.h	\
 	loader.h	\
 	class.h		\
@@ -106,20 +151,25 @@ libmetadatainclude_HEADERS = \
 	profiler.h	\
 	appdomain.h	\
 	debug-helpers.h	\
-	mempool.h	\
-	rand.h
+	mempool.h
 
 pedump_SOURCES =		\
 	pedump.c
 
-pedump_LDADD = libmetadata.la ../io-layer/libwapi.la ../utils/libmonoutils.la $(GLIB_LIBS) $(GMODULE_LIBS) -lm
+pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
+	$(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
 
+monodiet_SOURCES = monodiet.c
 
-monosn_LDADD = \
-	../metadata/libmetadata.la	\
+monodiet_LDADD = \
+	libmonoruntime.la	\
 	../io-layer/libwapi.la		\
 	../utils/libmonoutils.la	\
+	$(LIBGC_LIBS)			\
 	$(GLIB_LIBS)			\
 	$(GMODULE_LIBS) 		\
+	$(ICU_LIBS)			\
 	-lm
 
+EXTRA_DIST = make-bundle.pl sample-bundle
+