* src/vm/jit/asmpart.h (asm_compare_and_swap): Added.

[cacao.git] / src / mm / Makefile.am

diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
index ac7c5d20fc73d5fc62209105ed923f69d790e907..8ef863bb26602046df61e2f37c444f9b374e17d7 100644 (file)
--- a/src/mm/Makefile.am
+++ b/src/mm/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 5884 2006-10-31 20:11:28Z twisti $
+## $Id: Makefile.am 5900 2006-11-04 17:30:44Z michi $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -37,12 +37,15 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top
 LIBS =
 
 DIST_SUBDIRS = \
-       boehm-gc
+       boehm-gc \
+       cacao-gc
 
 if DISABLE_GC
 GC_FILE = \
        nogc.c
-else
+endif
+
+if ENABLE_GC_BOEHM
 SUBDIRS = \
        boehm-gc
 
@@ -53,12 +56,20 @@ GC_LIB = \
        $(top_builddir)/src/mm/boehm-gc/libgc.la
 endif
 
+if ENABLE_GC_CACAO
+SUBDIRS = \
+       cacao-gc
+
+GC_LIB = \
+       $(top_builddir)/src/mm/cacao-gc/libgc.la
+endif
+
 noinst_LTLIBRARIES = \
        libmm.la
 
 libmm_la_SOURCES = \
        $(GC_FILE) \
-       boehm.h \
+       gc-common.h \
        memory.c \
        memory.h