* src/vm/properties.c: Moved to .cpp.

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

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index bdc79e4f8426bc0833e0ea80d2aa1d6f401bc296..3970ef8160c791650d6fa7050c99519a346a17a2 100644 (file)
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -1,9 +1,7 @@
 ## src/vm/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.
 ##
@@ -22,7 +20,6 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 
-## 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) -I$(top_builddir)/src -I$(top_srcdir)/contrib/vmlog -I$(top_srcdir)/src/native
 
@@ -30,12 +27,48 @@ LIBS =
 
 SUBDIRS = jit
 
+if ENABLE_ASSERTION
+ASSERTION_SOURCES = \
+       assertion.c \
+       assertion.h
+endif
+
 if ENABLE_CYCLES_STATS
 CYCLES_STATS_SOURCES = \
        cycles-stats.c \
        cycles-stats.h
 endif
 
+if ENABLE_JAVASE
+if ENABLE_ANNOTATIONS
+ANNOTATION_SOURCES = \
+       annotation.c \
+       annotation.h
+endif
+
+STACKMAP_SOURCES = \
+       stackmap.c \
+       stackmap.h
+endif
+
+if ENABLE_RT_TIMING
+RT_TIMING_SOURCES = \
+       rt-timing.c \
+       rt-timing.h
+endif
+
+if ENABLE_STATISTICS
+STATISTICS_SOURCES = \
+       statistics.c \
+       statistics.h
+endif
+
+if ENABLE_ZLIB
+ZLIB_SOURCES = \
+       zip.c \
+       zip.h
+endif
+
 noinst_HEADERS = \
        global.h \
        types.h
@@ -46,33 +79,63 @@ noinst_LTLIBRARIES = \
 libvm_la_SOURCES = \
        access.c \
        access.h \
+       $(ANNOTATION_SOURCES) \
        array.c \
        array.h \
-       builtin.c \
-       builtin.h \
-       builtintable.inc \
+       $(ASSERTION_SOURCES) \
+       class.c \
+       class.h \
+       classcache.c \
+       classcache.h \
        $(CYCLES_STATS_SOURCES) \
-       exceptions.c \
-       exceptions.h \
+       descriptor.c \
+       descriptor.h \
+       exceptions.cpp \
+       exceptions.hpp \
+       field.cpp \
+       field.hpp \
        finalizer.c \
        finalizer.h \
+       globals.cpp \
+       globals.hpp \
        initialize.c \
        initialize.h \
+       javaobjects.cpp \
+       javaobjects.hpp \
        jit_interface.h \
-       package.c \
-       package.h \
-       primitive.c \
-       primitive.h \
-       properties.c \
-       properties.h \
+       linker.c \
+       linker.h \
+       loader.cpp \
+       loader.hpp \
+       method.c \
+       method.h \
+       options.c \
+       options.h \
+       os.cpp \
+       os.hpp \
+       package.cpp \
+       package.hpp \
+       primitive.cpp \
+       primitive.hpp \
+       properties.cpp \
+       properties.hpp \
+       references.h \
        resolve.c \
        resolve.h \
+       $(RT_TIMING_SOURCES) \
        signal.c \
        signallocal.h \
-       string.c \
-       stringlocal.h \
-       vm.c \
-       vm.h
+       $(STACKMAP_SOURCES) \
+       $(STATISTICS_SOURCES) \
+       string.cpp \
+       string.hpp \
+       suck.c \
+       suck.h \
+       utf8.c \
+       utf8.h \
+       vm.cpp \
+       vm.hpp \
+       $(ZLIB_SOURCES)
 
 libvm_la_LIBADD = \
        jit/libjit.la