* Merged twisti branch to default. This merge introduces C++ wrapper

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

diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am
index 41a8fcd5e5268201aba674a5c08eee4e83500a47..f819ead808e5c7a9f5e773810846a6e11ba59614 100644 (file)
--- a/src/native/vm/Makefile.am
+++ b/src/native/vm/Makefile.am
@@ -27,8 +27,8 @@ LIBS =
 
 DIST_SUBDIRS = \
        cldc1.1 \
-       gnu \
-       sun
+       gnuclasspath \
+       openjdk
 
 if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
 SUBDIRS = \
@@ -40,27 +40,27 @@ endif
 
 if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
 SUBDIRS = \
-       gnu
+       gnuclasspath
 
 NATIVEVM_LIB = \
-       gnu/libnativevmcore.la
+       gnuclasspath/libnativevmcore.la
 endif
 
 if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
 SUBDIRS = \
-       sun
+       openjdk
 
 NATIVEVM_LIB = \
-       sun/libnativevmcore.la
+       openjdk/libnativevmcore.la
 endif
 
 if ENABLE_JAVASE
-REFLECT_SOURCES = \
-       reflect.c \
-       reflect.h
+REFLECTION_SOURCES = \
+       reflection.c \
+       reflection.h
 
 SUN_MISC_UNSAFE_SOURCES = \
-       sun_misc_Unsafe.c
+       sun_misc_Unsafe.cpp
 endif
 
 noinst_LTLIBRARIES = \
@@ -69,7 +69,7 @@ noinst_LTLIBRARIES = \
 libnativevm_la_SOURCES = \
        nativevm.c \
        nativevm.h \
-       $(REFLECT_SOURCES) \
+       $(REFLECTION_SOURCES) \
        $(SUN_MISC_UNSAFE_SOURCES)
 
 libnativevm_la_LIBADD = \