X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvmcore%2FMakefile.am;h=cdc732505dd6da69ea8e9d2702785a20843c8b31;hb=345ceab5946711a40fdeefb55a0cf469960146d0;hp=1d647a9efab27d66e2c0a9dbe4bd4f51d8082e78;hpb=d6b89d31b958c8ffb5ccb3886c4efabd8c44fb0a;p=cacao.git

diff --git a/src/vmcore/Makefile.am b/src/vmcore/Makefile.am
index 1d647a9ef..cdc732505 100644
--- a/src/vmcore/Makefile.am
+++ b/src/vmcore/Makefile.am
@@ -1,9 +1,7 @@
 ## src/vmcore/Makefile.am
 ##
-## Copyright (C) 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) 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,19 +19,18 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## $Id: Makefile.am 6216 2006-12-18 18:21:37Z twisti $
 
-## 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)
 
 LIBS =
 
 if ENABLE_JAVASE
+if ENABLE_ANNOTATIONS
 ANNOTATION_SOURCES = \
 	annotation.c \
 	annotation.h
+endif
 
 STACKMAP_SOURCES = \
 	stackmap.c \
@@ -71,6 +68,10 @@ libvmcore_la_SOURCES = \
 	descriptor.h \
 	field.c \
 	field.h \
+	globals.cpp \
+	globals.hpp \
+	javaobjects.hpp \
+	javaobjects.cpp \
 	linker.c \
 	linker.h \
 	loader.c \
@@ -79,8 +80,9 @@ libvmcore_la_SOURCES = \
 	method.h \
 	options.c \
 	options.h \
-	primitive.c \
-	primitive.h \
+	os.cpp \
+	os.hpp \
+	primitivecore.c \
 	references.h \
 	$(RT_TIMING_SOURCES) \
 	$(STACKMAP_SOURCES) \