X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2FMakefile.am;h=6ff2368895bb0dc87158f4d05b6a93f9be1aab0e;hb=c28164a651e968a5f4704db98d26e3d9e3f522aa;hp=0206dc18bb04eae94099f0f72e856437007b14bd;hpb=8ab849b3b7164ea54ce09b99dc05f94db7295cff;p=mono.git

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 0206dc18bb0..6ff2368895b 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -5,17 +5,15 @@ if PLATFORM_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
+else
 assembliesdir = $(exec_prefix)/lib
 confdir = $(sysconfdir)
 endif
 
-PLATFORM_LIB = ../os/libmonoos.la 
-
-bin_PROGRAMS = pedump monodiet
+bin_PROGRAMS = pedump
 
 #
 # libtool is not capable of creating static/shared versions of the same
@@ -23,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) -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
 
 #
 # Make sure any prefix changes are updated in the binaries too.
@@ -39,22 +36,27 @@ 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	\
 	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	\
+	mono-mlist.c	\
+	mono-mlist.h	\
 	monitor.c	\
 	monitor.h	\
 	tabledefs.h \
@@ -69,8 +71,6 @@ libmonoruntime_la_SOURCES = \
 	socket-io.h	\
 	exception.c	\
 	exception.h	\
-	unicode.c	\
-	unicode.h	\
 	appdomain.c	\
 	debug-mono-symfile.h	\
 	debug-mono-symfile.c	\
@@ -84,6 +84,8 @@ libmonoruntime_la_SOURCES = \
 	rand.c		\
 	security.c	\
 	security.h	\
+	security-core-clr.c	\
+	security-core-clr.h	\
 	string-icalls.c \
 	string-icalls.h \
 	sysmath.h	\
@@ -94,6 +96,7 @@ libmonoruntime_la_SOURCES = \
 	environment.h	\
 	locales.c	\
 	locales.h	\
+	normalization-tables.h	\
 	filewatcher.c	\
 	filewatcher.h	\
 	culture-info.h  \
@@ -114,12 +117,12 @@ libmonoruntime_la_SOURCES = \
 	mono-endian.c	\
 	mono-endian.h	\
 	mono-config.c	\
-	mono-config.h	\
 	rawbuffer.c	\
 	rawbuffer.h	\
 	loader.c	\
 	class.c		\
 	class-internals.h		\
+	wrapper-types.h		\
 	mempool.c	\
 	debug-helpers.c
 
@@ -127,9 +130,10 @@ libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
 
 libmonoruntime_static_la_LDFLAGS = -static
 
-libmonoruntimeincludedir = $(includedir)/mono/metadata
+libmonoruntimeincludedir = $(includedir)/mono-$(API_VER)/mono/metadata
 
 libmonoruntimeinclude_HEADERS = \
+	attrdefs.h	\
 	appdomain.h	\
 	mono-debug.h	\
 	mono-gc.h	\
@@ -151,6 +155,7 @@ libmonoruntimeinclude_HEADERS = \
 	exception.h	\
 	profiler.h	\
 	appdomain.h	\
+	mono-config.h	\
 	debug-helpers.h	\
 	mempool.h
 
@@ -158,21 +163,7 @@ 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
-
-monodiet_LDADD = \
-	libmonoruntime.la	\
-	../io-layer/libwapi.la		\
-	../utils/libmonoutils.la	\
-	$(PLATFORM_LIB)			\
-	$(LIBGC_LIBS)			\
-	$(GLIB_LIBS)			\
-	$(GMODULE_LIBS) 		\
-	$(ICU_LIBS)			\
-	-lm
+	$(LIBGC_LIBS) $(GLIB_LIBS) -lm
 
 EXTRA_DIST = make-bundle.pl sample-bundle