* 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 c3d7f6ff9760fa79bc333d2ce4a245bbffc07fe9..70d401e344d2d2535952352380e3d77fbf0af077 100644 (file)
--- a/src/native/vm/Makefile.am
+++ b/src/native/vm/Makefile.am
@@ -27,10 +27,10 @@ LIBS =
 
 DIST_SUBDIRS = \
        cldc1.1 \
-       gnu \
-       sun
+       gnuclasspath \
+       openjdk
 
-if WITH_CLASSPATH_CLDC1_1
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
 SUBDIRS = \
        cldc1.1
 
@@ -38,20 +38,20 @@ 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 WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
 SUBDIRS = \
-       sun
+       openjdk
 
 NATIVEVM_LIB = \
-       sun/libnativevmcore.la
+       openjdk/libnativevmcore.la
 endif
 
 if ENABLE_JAVASE
@@ -70,9 +70,6 @@ libnativevm_la_SOURCES = \
        nativevm.c \
        nativevm.h \
        $(REFLECT_SOURCES) \
-       \
-       java_lang_Class.c \
-       java_lang_Class.h \
        $(SUN_MISC_UNSAFE_SOURCES)
 
 libnativevm_la_LIBADD = \