X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fnative%2Fvm%2FMakefile.am;h=065426fbd7319652189bdb8f7d71129e50f82a10;hb=4106db76b52866ec97c8fef95681282528b04b02;hp=580370a89b4e490da1b8e6382b89dda63a19036b;hpb=512e8d95ab6004592f83d8fcfb46f959944caa42;p=cacao.git

diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am
index 580370a89..065426fbd 100644
--- a/src/native/vm/Makefile.am
+++ b/src/native/vm/Makefile.am
@@ -1,9 +1,7 @@
 ## src/native/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,47 +19,62 @@
 ## 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 4661 2006-03-21 00:04:59Z motse $
 
-## 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
 
 LIBS =
 
-noinst_LTLIBRARIES = libnativevm.la
+DIST_SUBDIRS = \
+	cldc1.1 \
+	gnuclasspath \
+	openjdk
 
-libnativevm_la_SOURCES = \
-	Constructor.c \
-	Field.c \
-	Method.c \
-	VMAccessController.c \
-	VMClass.c \
-	VMClassLoader.c \
-	VMObject.c \
-	VMProxy.c \
-	VMRuntime.c \
-	VMStackWalker.c \
-	VMString.c \
-	VMSystem.c \
-	VMSystemProperties.c \
-	VMThread.c \
-	VMThrowable.c
-
-if ENABLE_JVMTI
-libnativevm_la_SOURCES += \
-	VMFrame.c \
-	VMVirtualMachine.c \
-	VMMethod.c
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
+SUBDIRS = \
+	cldc1.1
+
+NATIVEVM_LIB = \
+	cldc1.1/libnativevmcore.la
 endif
 
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
+SUBDIRS = \
+	gnuclasspath
+
+NATIVEVM_LIB = \
+	gnuclasspath/libnativevmcore.la
+endif
+
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+SUBDIRS = \
+	openjdk
+
+NATIVEVM_LIB = \
+	openjdk/libnativevmcore.la
+endif
+
+if ENABLE_JAVASE
+REFLECTION_SOURCES = \
+	reflection.cpp \
+	reflection.hpp
+
+SUN_MISC_UNSAFE_SOURCES = \
+	sun_misc_Unsafe.cpp
+endif
+
+noinst_LTLIBRARIES = \
+	libnativevm.la
+
+libnativevm_la_SOURCES = \
+	nativevm.cpp \
+	nativevm.h \
+	$(REFLECTION_SOURCES) \
+	$(SUN_MISC_UNSAFE_SOURCES)
+
+libnativevm_la_LIBADD = \
+	$(NATIVEVM_LIB)
+
 
 ## Local variables:
 ## mode: Makefile