X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmm%2FMakefile.am;h=6ddf673df6507c3bc7bb1a7d9ee0650e05ae93e0;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=455a9c2f38683098bebceef5f20379a0bafcb92c;hpb=e0cb6c3e638be4dc28b232dea1c8ff6328a6bd8f;p=cacao.git

diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am
index 455a9c2f3..6ddf673df 100644
--- a/src/mm/Makefile.am
+++ b/src/mm/Makefile.am
@@ -1,9 +1,9 @@
 ## src/mm/Makefile.am
 ##
-## Copyright (C) 1996-2005 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,
-## TU Wien
+## 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
 ##
 ## This file is part of CACAO.
 ##
@@ -19,29 +19,54 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
-##
-## Contact: cacao@complang.tuwien.ac.at
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 1699 2004-12-06 12:44:24Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
+
+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 =
 
-## Process this file with automake to produce Makefile.in
+DIST_SUBDIRS = \
+	boehm-gc \
+	cacao-gc
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/@ARCH_DIR@
+if DISABLE_GC
+GC_FILE = \
+	nogc.c
+endif
 
-noinst_LTLIBRARIES = libmm.la
+if ENABLE_GC_BOEHM
+SUBDIRS = \
+	boehm-gc
+
+GC_FILE = \
+	boehm.c
+
+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 = \
-	boehm.c \
-	boehm.h \
+	$(GC_FILE) \
+	gc-common.h \
 	memory.c \
 	memory.h
 
+libmm_la_LIBADD = \
+	$(GC_LIB)
+
 
 ## Local variables:
 ## mode: Makefile