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 ab39ff1eed9963b03ae5f0d62e347a126883d14a..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, 2007 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,12 +19,9 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## $Id: Makefile.am 7246 2007-01-29 18:49:05Z 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 =
 
@@ -36,7 +31,7 @@ DIST_SUBDIRS = \
 
 if DISABLE_GC
 GC_FILE = \
-       nogc.c
+       gc-none.cpp
 endif
 
 if ENABLE_GC_BOEHM
@@ -44,7 +39,7 @@ SUBDIRS = \
        boehm-gc
 
 GC_FILE = \
-       boehm.c
+       gc-boehm.cpp
 
 GC_LIB = \
        $(top_builddir)/src/mm/boehm-gc/libgc.la
@@ -62,14 +57,23 @@ noinst_LTLIBRARIES = \
        libmm.la
 
 libmm_la_SOURCES = \
+       codememory.c \
+       codememory.h \
+       dumpmemory.cpp \
+       dumpmemory.hpp \
        $(GC_FILE) \
-       gc-common.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