X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2FMakefile.am;h=2d4f2c48dd93f03f2562f6e170c788e287ac0a35;hb=0775e531232398c8363a68846224bd86e859e322;hp=7aa719ae35d8aa3329c2eb8468ef7dacb07c4e8b;hpb=e9db8aa4d02e34ed48fc04d207427f55ac46d7c7;p=cacao.git

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 7aa719ae3..2d4f2c48d 100644
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -1,9 +1,7 @@
 ## src/vm/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,44 +19,54 @@
 ## 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 4809 2006-04-21 21:36:54Z edwin $
 
-## 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 -I$(top_srcdir)/contrib/vmlog -I$(top_srcdir)/src/native
 
 LIBS =
 
 SUBDIRS = jit
 
-if ENABLE_STATISTICS
-STATISTICS_OBJ = \
-	statistics.c \
-	statistics.h
-endif
-
-if ENABLE_RT_TIMING
-RT_TIMING_OBJ = \
-	rt-timing.c
+if ENABLE_ASSERTION
+ASSERTION_SOURCES = \
+	assertion.cpp \
+	assertion.hpp
 endif
 
 if ENABLE_CYCLES_STATS
-CYCLES_STATS_SOURCE = \
+CYCLES_STATS_SOURCES = \
 	cycles-stats.c \
 	cycles-stats.h
 endif
 
+if ENABLE_JAVASE
+if ENABLE_ANNOTATIONS
+ANNOTATION_SOURCES = \
+	annotation.cpp \
+	annotation.hpp
+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_OBJ = \
-	zip.c \
-	zip.h
+ZLIB_SOURCES = \
+	zip.cpp \
+	zip.hpp
 endif
 
 noinst_HEADERS = \
@@ -66,64 +74,73 @@ noinst_HEADERS = \
 	types.h
 
 noinst_LTLIBRARIES = \
-	libvmcore.la \
 	libvm.la
 
-libvmcore_la_SOURCES = \
-	access.c \
-	access.h \
-	builtin.c \
-	builtin.h \
-	builtintable.inc \
-	class.c \
-	class.h \
-	classcache.c \
-	classcache.h \
-	$(CYCLES_STATS_SOURCE) \
-	descriptor.c \
-	descriptor.h \
-	field.c \
-	field.h \
-	finalizer.c \
-	finalizer.h \
-	hashtable.c \
-	hashtable.h \
-	initialize.c \
-	initialize.h \
-	linker.c \
-	linker.h \
-	loader.c \
-	loader.h \
-	method.c \
-	method.h \
+libvm_la_SOURCES = \
+	access.cpp \
+	access.hpp \
+	$(ANNOTATION_SOURCES) \
+	array.cpp \
+	array.hpp \
+	$(ASSERTION_SOURCES) \
+	breakpoint.hpp \
+	class.cpp \
+	class.hpp \
+	classcache.cpp \
+	classcache.hpp \
+	$(CYCLES_STATS_SOURCES) \
+	descriptor.cpp \
+	descriptor.hpp \
+	exceptions.cpp \
+	exceptions.hpp \
+	field.cpp \
+	field.hpp \
+	finalizer.cpp \
+	finalizer.hpp \
+	globals.cpp \
+	globals.hpp \
+	hook.cpp \
+	hook.hpp \
+	initialize.cpp \
+	initialize.hpp \
+	javaobjects.cpp \
+	javaobjects.hpp \
+	linker.cpp \
+	linker.hpp \
+	loader.cpp \
+	loader.hpp \
+	method.cpp \
+	method.hpp \
 	options.c \
 	options.h \
-	properties.c \
-	properties.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_OBJ) \
-	rt-timing.h \
-	$(STATISTICS_OBJ) \
-	signal.c \
-	signallocal.h \
-	string.c \
-	stringlocal.h \
-	suck.c \
-	suck.h \
+	resolve.cpp \
+	resolve.hpp \
+	$(RT_TIMING_SOURCES) \
+	signal.cpp \
+	signallocal.hpp \
+	$(STACKMAP_SOURCES) \
+	$(STATISTICS_SOURCES) \
+	string.cpp \
+	string.hpp \
+	suck.cpp \
+	suck.hpp \
 	utf8.c \
 	utf8.h \
-	$(ZLIB_OBJ)
-
-libvm_la_SOURCES = \
-	exceptions.c \
-	exceptions.h \
-	vm.c \
-	vm.h
+	vftbl.hpp \
+	vm.cpp \
+	vm.hpp \
+	$(ZLIB_SOURCES)
 
 libvm_la_LIBADD = \
-	libvmcore.la \
 	jit/libjit.la