projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move declaration to a more appropriate header.
[mono.git]
/
mono
/
metadata
/
Makefile.am
diff --git
a/mono/metadata/Makefile.am
b/mono/metadata/Makefile.am
index 8187bca68cbc75ded1816f702aec27ec96c3991a..11c656d43ae79e2df5e002e6e80ea22c3d53650c 100644
(file)
--- a/
mono/metadata/Makefile.am
+++ b/
mono/metadata/Makefile.am
@@
-139,6
+139,8
@@
libmonoruntime_la_SOURCES = \
mono-basic-block.c \
mono-basic-block.h \
mono-config.c \
mono-basic-block.c \
mono-basic-block.h \
mono-config.c \
+ mono-cq.c \
+ mono-cq.h \
mono-debug.h \
mono-debug.c \
mono-debug-debugger.h \
mono-debug.h \
mono-debug.c \
mono-debug-debugger.h \
@@
-191,6
+193,8
@@
libmonoruntime_la_SOURCES = \
sgen-major-copying.c \
sgen-los.c \
sgen-protocol.c \
sgen-major-copying.c \
sgen-los.c \
sgen-protocol.c \
+ sgen-bridge.c \
+ sgen-bridge.h \
sgen-gc.h \
sgen-archdep.h \
sgen-cardtable.h \
sgen-gc.h \
sgen-archdep.h \
sgen-cardtable.h \
@@
-214,8
+218,14
@@
libmonoruntime_la_SOURCES = \
libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES)
libmonoruntime_la_CFLAGS = $(BOEHM_DEFINES)
+if MOONLIGHT
libmonoruntimemoon_la_SOURCES = $(libmonoruntime_la_SOURCES)
libmonoruntimemoon_la_SOURCES = $(libmonoruntime_la_SOURCES)
+if MOONLIGHT_BOEHM
libmonoruntimemoon_la_CFLAGS = $(MOONLIGHT_DEFINES) $(BOEHM_DEFINES)
libmonoruntimemoon_la_CFLAGS = $(MOONLIGHT_DEFINES) $(BOEHM_DEFINES)
+else
+libmonoruntimemoon_la_CFLAGS = $(MOONLIGHT_DEFINES) $(SGEN_DEFINES)
+endif
+endif
libmonoruntimesgen_la_SOURCES = $(libmonoruntime_la_SOURCES)
libmonoruntimesgen_la_CFLAGS = $(SGEN_DEFINES)
libmonoruntimesgen_la_SOURCES = $(libmonoruntime_la_SOURCES)
libmonoruntimesgen_la_CFLAGS = $(SGEN_DEFINES)
@@
-247,6
+257,7
@@
libmonoruntimeinclude_HEADERS = \
mono-config.h \
mono-debug.h \
mono-gc.h \
mono-config.h \
mono-debug.h \
mono-gc.h \
+ sgen-bridge.h \
object.h \
opcodes.h \
profiler.h \
object.h \
opcodes.h \
profiler.h \
@@
-279,5
+290,6
@@
pedump_LDFLAGS=-framework CoreFoundation
endif
endif
endif
endif
-EXTRA_DIST = make-bundle.pl sample-bundle $(win32_sources) $(unix_sources) $(null_sources) $(sgen_sources) runtime.h
+EXTRA_DIST = make-bundle.pl sample-bundle $(win32_sources) $(unix_sources) $(null_sources) $(sgen_sources) runtime.h \
+ tpool-poll.c tpool-epoll.c tpool-kqueue.c