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 22c39cec2ed77c989a22004cbf4b07976c250b7f..b486fcf3327a26ca3ae973fd931ae1caffcfa1cc 100644 (file)
--- a/src/mm/Makefile.am
+++ b/src/mm/Makefile.am
@@ -31,7 +31,7 @@ DIST_SUBDIRS = \
 
 if DISABLE_GC
 GC_FILE = \
-       nogc.c
+       gc-none.cpp
 endif
 
 if ENABLE_GC_BOEHM
@@ -39,7 +39,7 @@ SUBDIRS = \
        boehm-gc
 
 GC_FILE = \
-       boehm.c
+       gc-boehm.cpp
 
 GC_LIB = \
        $(top_builddir)/src/mm/boehm-gc/libgc.la
@@ -59,16 +59,21 @@ noinst_LTLIBRARIES = \
 libmm_la_SOURCES = \
        codememory.c \
        codememory.h \
-       dumpmemory.c \
-       dumpmemory.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