* tests/regression/Makefile.am (JAVACCMD): Added -source 1.5 -target

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

diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
index ac7c5d20fc73d5fc62209105ed923f69d790e907..22c39cec2ed77c989a22004cbf4b07976c250b7f 100644 (file)
--- a/src/mm/Makefile.am
+++ b/src/mm/Makefile.am
@@ -1,9 +1,7 @@
 ## src/mm/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-## C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-## E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-## J. Wenninger, Institut f. Computersprachen - TU Wien
+## Copyright (C) 1996-2005, 2006, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,28 +19,22 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 5884 2006-10-31 20:11:28Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)/src
 
 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 +45,24 @@ 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 = \
+       codememory.c \
+       codememory.h \
+       dumpmemory.c \
+       dumpmemory.h \
        $(GC_FILE) \
-       boehm.h \
+       gc-common.h \
        memory.c \
        memory.h