2005-09-27 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index 70a24255d4003a119b92c4b028b7114f76c4cdcc..4eb70f7519666342c68e1d783c828ce272380483 100644 (file)
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -10,7 +10,7 @@ confdir = `cygpath -m "${sysconfdir}"`
 AM_CFLAGS = -O
 PLATFORM_LIB = ../os/libmonoos.la
 else
-assembliesdir = $(libdir)
+assembliesdir = $(exec_prefix)/lib
 confdir = $(sysconfdir)
 endif
 
@@ -26,6 +26,16 @@ noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
 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
 
@@ -47,10 +57,12 @@ libmonoruntime_la_SOURCES = \
        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     \
@@ -96,7 +108,6 @@ libmonoruntime_la_SOURCES = \
        opcodes.c       \
        image.c         \
        cil-coff.h      \
-       tabledefs.h     \
        metadata.c      \
        metadata-internals.h    \
        verify.c        \
@@ -104,7 +115,6 @@ libmonoruntime_la_SOURCES = \
        mono-endian.h   \
        mono-config.c   \
        mono-config.h   \
-       private.h       \
        rawbuffer.c     \
        rawbuffer.h     \
        loader.c        \
@@ -149,6 +159,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
@@ -157,6 +168,7 @@ monodiet_LDADD = \
        libmonoruntime.la       \
        ../io-layer/libwapi.la          \
        ../utils/libmonoutils.la        \
+       $(PLATFORM_LIB)                 \
        $(LIBGC_LIBS)                   \
        $(GLIB_LIBS)                    \
        $(GMODULE_LIBS)                 \