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

diff --git a/src/vm/Makefile.am b/src/vm/Makefile.am
index 1255eca99..2d4f2c48d 100644
--- a/src/vm/Makefile.am
+++ b/src/vm/Makefile.am
@@ -29,8 +29,8 @@ SUBDIRS = jit
 
 if ENABLE_ASSERTION
 ASSERTION_SOURCES = \
-	assertion.c \
-	assertion.h
+	assertion.cpp \
+	assertion.hpp
 endif
 
 if ENABLE_CYCLES_STATS
@@ -39,6 +39,36 @@ CYCLES_STATS_SOURCES = \
 	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_SOURCES = \
+	zip.cpp \
+	zip.hpp
+endif
+
 noinst_HEADERS = \
 	global.h \
 	types.h
@@ -47,36 +77,68 @@ noinst_LTLIBRARIES = \
 	libvm.la
 
 libvm_la_SOURCES = \
+	access.cpp \
+	access.hpp \
+	$(ANNOTATION_SOURCES) \
+	array.cpp \
+	array.hpp \
 	$(ASSERTION_SOURCES) \
-	access.c \
-	access.h \
-	array.c \
-	array.h \
-	builtin.c \
-	builtin.h \
-	builtintable.inc \
+	breakpoint.hpp \
+	class.cpp \
+	class.hpp \
+	classcache.cpp \
+	classcache.hpp \
 	$(CYCLES_STATS_SOURCES) \
+	descriptor.cpp \
+	descriptor.hpp \
 	exceptions.cpp \
 	exceptions.hpp \
-	finalizer.c \
-	finalizer.h \
-	initialize.c \
-	initialize.h \
-	jit_interface.h \
+	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 \
+	os.cpp \
+	os.hpp \
 	package.cpp \
 	package.hpp \
 	primitive.cpp \
 	primitive.hpp \
-	properties.c \
-	properties.h \
-	resolve.c \
-	resolve.h \
-	signal.c \
-	signallocal.h \
+	properties.cpp \
+	properties.hpp \
+	references.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 \
+	vftbl.hpp \
 	vm.cpp \
-	vm.hpp
+	vm.hpp \
+	$(ZLIB_SOURCES)
 
 libvm_la_LIBADD = \
 	jit/libjit.la