New test.

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index ccd7b4cad4169a11da7ad4ea3136d16c308cac0d..48e228bbaeaf81e1c39226a3a383d3bf07cec879 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,16 +1,15 @@
 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}"`
+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
-PLATFORM_LIB = ../os/libmonoos.la
-else
-assembliesdir = $(libdir)
+assembliesdir = $(exec_prefix)/lib
 confdir = $(sysconfdir)
 endif
 
@@ -20,46 +19,56 @@ 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 = libmetadata.la libmonoruntime.la libmetadata-static.la libmonoruntime-static.la
+noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.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)\"
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(ICU_CFLAGS) \
-       -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
 
 CLEANFILES = mono-bundle.stamp
 
-libmetadata_la_LIBADD = $(bundle_obj) $(PLATFORM_LIB)
-
-libmonoruntime_static_la_LIBADD = $(libmonoruntime_la_LIBADD)
-libmetadata_static_la_LIBADD = $(libmetadata_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       \
        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    \
@@ -83,19 +92,21 @@ libmonoruntime_la_SOURCES = \
        environment.h   \
        locales.c       \
        locales.h       \
+       normalization-tables.h  \
        filewatcher.c   \
        filewatcher.h   \
        culture-info.h  \
-       culture-info-tables.h
-
-libmetadata_la_SOURCES = \
+       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      \
-       tabledefs.h     \
        metadata.c      \
        metadata-internals.h    \
        verify.c        \
@@ -103,7 +114,6 @@ libmetadata_la_SOURCES = \
        mono-endian.h   \
        mono-config.c   \
        mono-config.h   \
-       private.h       \
        rawbuffer.c     \
        rawbuffer.h     \
        loader.c        \
@@ -112,24 +122,19 @@ libmetadata_la_SOURCES = \
        mempool.c       \
        debug-helpers.c
 
-libmetadata_static_la_SOURCES = $(libmetadata_la_SOURCES)
 libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES)
 
-libmetadata_static_la_LDFLAGS = -static
 libmonoruntime_static_la_LDFLAGS = -static
 
-libmetadataincludedir = $(includedir)/mono/metadata
 libmonoruntimeincludedir = $(includedir)/mono/metadata
 
 libmonoruntimeinclude_HEADERS = \
        appdomain.h     \
        mono-debug.h    \
-       mono-debug-debugger.h   \
+       mono-gc.h       \
        debug-mono-symfile.h    \
        threads.h       \
-       environment.h
-
-libmetadatainclude_HEADERS = \
+       environment.h   \
        assembly.h      \
        opcodes.h       \
        blob.h          \
@@ -151,14 +156,13 @@ libmetadatainclude_HEADERS = \
 pedump_SOURCES =               \
        pedump.c
 
-pedump_LDADD = libmetadata.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
+pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
        $(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
 
 monodiet_SOURCES = monodiet.c
 
 monodiet_LDADD = \
        libmonoruntime.la       \
-       libmetadata.la  \
        ../io-layer/libwapi.la          \
        ../utils/libmonoutils.la        \
        $(LIBGC_LIBS)                   \