Merged branch subtype-trunk into default.

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

diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
index 65c99c4299417630a690a999bf8527956b336b50..b486fcf3327a26ca3ae973fd931ae1caffcfa1cc 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,33 +19,61 @@
 ## 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 4357 2006-01-22 23:33:38Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_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 \
+       cacao-gc
 
 if DISABLE_GC
-GC_FILE = nogc.c
-else
-GC_FILE = boehm.c
+GC_FILE = \
+       gc-none.cpp
 endif
 
-noinst_LTLIBRARIES = libmm.la
+if ENABLE_GC_BOEHM
+SUBDIRS = \
+       boehm-gc
+
+GC_FILE = \
+       gc-boehm.cpp
+
+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.cpp \
+       dumpmemory.hpp \
        $(GC_FILE) \
-       boehm.h \
-       memory.c \
-       memory.h
+       gc.hpp \
+       memory.cpp \
+       memory.hpp
+
+libmm_la_LIBADD = \
+       $(GC_LIB)
 
+if ENABLE_TLH
+libmm_la_SOURCES += \
+       tlh.h \
+       tlh.c
+endif
 
 ## Local variables:
 ## mode: Makefile