2007-10-11 Mark Probst <mark.probst@gmail.com>

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 5896ea75cf7c608c11e455a31c512baea84f7d94..6ff2368895bb0dc87158f4d05b6a93f9be1aab0e 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -5,15 +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
 
-bin_PROGRAMS = pedump monodiet
+bin_PROGRAMS = pedump
 
 #
 # libtool is not capable of creating static/shared versions of the same
@@ -21,7 +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_BINDIR=\"$(bindir)/\" -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.
@@ -55,6 +55,8 @@ libmonoruntime_la_SOURCES = \
        gc-internal.h   \
        marshal.c       \
        marshal.h       \
+       mono-mlist.c    \
+       mono-mlist.h    \
        monitor.c       \
        monitor.h       \
        tabledefs.h \
@@ -82,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       \
@@ -118,6 +122,7 @@ libmonoruntime_la_SOURCES = \
        loader.c        \
        class.c         \
        class-internals.h               \
+       wrapper-types.h         \
        mempool.c       \
        debug-helpers.c
 
@@ -158,19 +163,7 @@ pedump_SOURCES =           \
        pedump.c
 
 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       \
-       ../io-layer/libwapi.la          \
-       ../utils/libmonoutils.la        \
-       $(LIBGC_LIBS)                   \
-       $(GLIB_LIBS)                    \
-       $(GMODULE_LIBS)                 \
-       $(ICU_LIBS)                     \
-       -lm
+       $(LIBGC_LIBS) $(GLIB_LIBS) -lm
 
 EXTRA_DIST = make-bundle.pl sample-bundle