projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New test.
[mono.git]
/
mono
/
metadata
/
Makefile.am
diff --git
a/mono/metadata/Makefile.am
b/mono/metadata/Makefile.am
index 89d26ddd96553b7583689dada2eff3fdba293b1f..48e228bbaeaf81e1c39226a3a383d3bf07cec879 100644
(file)
--- a/
mono/metadata/Makefile.am
+++ b/
mono/metadata/Makefile.am
@@
-13,8
+13,6
@@
assembliesdir = $(exec_prefix)/lib
confdir = $(sysconfdir)
endif
confdir = $(sysconfdir)
endif
-PLATFORM_LIB = ../os/libmonoos.la
-
bin_PROGRAMS = pedump monodiet
#
bin_PROGRAMS = pedump monodiet
#
@@
-23,8
+21,7
@@
bin_PROGRAMS = pedump monodiet
#
noinst_LTLIBRARIES = libmonoruntime.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_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+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.
#
# Make sure any prefix changes are updated in the binaries too.
@@
-39,18
+36,21
@@
assembly.lo mono-config.lo: Makefile
CLEANFILES = mono-bundle.stamp
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 \
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 \
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 \
gc.c \
gc-internal.h \
marshal.c \
@@
-69,8
+69,6
@@
libmonoruntime_la_SOURCES = \
socket-io.h \
exception.c \
exception.h \
socket-io.h \
exception.c \
exception.h \
- unicode.c \
- unicode.h \
appdomain.c \
debug-mono-symfile.h \
debug-mono-symfile.c \
appdomain.c \
debug-mono-symfile.h \
debug-mono-symfile.c \
@@
-94,6
+92,7
@@
libmonoruntime_la_SOURCES = \
environment.h \
locales.c \
locales.h \
environment.h \
locales.c \
locales.h \
+ normalization-tables.h \
filewatcher.c \
filewatcher.h \
culture-info.h \
filewatcher.c \
filewatcher.h \
culture-info.h \
@@
-133,7
+132,6
@@
libmonoruntimeinclude_HEADERS = \
appdomain.h \
mono-debug.h \
mono-gc.h \
appdomain.h \
mono-debug.h \
mono-gc.h \
- mono-debug-debugger.h \
debug-mono-symfile.h \
threads.h \
environment.h \
debug-mono-symfile.h \
threads.h \
environment.h \
@@
-159,7
+157,6
@@
pedump_SOURCES = \
pedump.c
pedump_LDADD = libmonoruntime.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
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
$(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
monodiet_SOURCES = monodiet.c
@@
-168,7
+165,6
@@
monodiet_LDADD = \
libmonoruntime.la \
../io-layer/libwapi.la \
../utils/libmonoutils.la \
libmonoruntime.la \
../io-layer/libwapi.la \
../utils/libmonoutils.la \
- $(PLATFORM_LIB) \
$(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
$(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \