* Merged with tip.

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

diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am
index 5cd7dee95a3dfd33821c44042301d26555586f57..70d401e344d2d2535952352380e3d77fbf0af077 100644 (file)
--- 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, 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.
 ##
@@ -21,10 +19,7 @@
 ## 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 5558 2006-09-28 19:33:24Z 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) -I$(top_builddir)/src
 
@@ -32,9 +27,10 @@ LIBS =
 
 DIST_SUBDIRS = \
        cldc1.1 \
-       gnu
+       gnuclasspath \
+       openjdk
 
-if WITH_CLASSPATH_CLDC1_1
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
 SUBDIRS = \
        cldc1.1
 
@@ -42,30 +38,26 @@ NATIVEVM_LIB = \
        cldc1.1/libnativevmcore.la
 endif
 
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
 SUBDIRS = \
-       gnu
+       gnuclasspath
 
 NATIVEVM_LIB = \
-       gnu/libnativevmcore.la
+       gnuclasspath/libnativevmcore.la
 endif
 
-if ENABLE_JAVASE
-CLASSLOADER_SOURCES = \
-       java_lang_ClassLoader.c \
-       java_lang_ClassLoader.h
-
-JAVA_LANG_REFLECT_CONSTRUCTOR_SOURCES = \
-       java_lang_reflect_Constructor.c \
-       java_lang_reflect_Constructor.h
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+SUBDIRS = \
+       openjdk
 
-JAVA_LANG_REFLECT_METHOD_SOURCES = \
-       java_lang_reflect_Method.c \
-       java_lang_reflect_Method.h
+NATIVEVM_LIB = \
+       openjdk/libnativevmcore.la
+endif
 
-JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES = \
-       java_util_concurrent_atomic_AtomicLong.c \
-       java_util_concurrent_atomic_AtomicLong.h
+if ENABLE_JAVASE
+REFLECT_SOURCES = \
+       reflect.c \
+       reflect.h
 
 SUN_MISC_UNSAFE_SOURCES = \
        sun_misc_Unsafe.c
@@ -77,21 +69,7 @@ noinst_LTLIBRARIES = \
 libnativevm_la_SOURCES = \
        nativevm.c \
        nativevm.h \
-       \
-       java_lang_Class.c \
-       java_lang_Class.h \
-       $(CLASSLOADER_SOURCES) \
-       java_lang_Object.c \
-       java_lang_Object.h \
-       java_lang_Runtime.c \
-       java_lang_Runtime.h \
-       java_lang_String.c \
-       java_lang_String.h \
-       java_lang_Thread.c \
-       java_lang_Thread.h \
-       $(JAVA_LANG_REFLECT_CONSTRUCTOR_SOURCES) \
-       $(JAVA_LANG_REFLECT_METHOD_SOURCES) \
-       $(JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES) \
+       $(REFLECT_SOURCES) \
        $(SUN_MISC_UNSAFE_SOURCES)
 
 libnativevm_la_LIBADD = \