* src/native/vm/sun_misc_Unsafe.cpp: Make both OpenJDK 6/7 versions of

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

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 1c19fa66fc76acd7a29b8a92426b909d7ce83cac..4806f11499a351bbd8eb16c9634bdac073eb4bfa 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -1,9 +1,7 @@
 ## src/native/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.
 ##
@@ -28,47 +26,29 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top
 LIBS =
 
 SUBDIRS = \
-       include \
        vm
 
-CLEANFILES = \
-       nativetable.inc
-
 if ENABLE_JVMTI
 SUBDIRS += jvmti
 JVMTI_LIB = jvmti/libjvmti.la
 endif
 
-if WITH_STATIC_CLASSPATH
-SUBDIRS += tools
-
-GENNATIVETABLE=$(top_builddir)/src/native/tools/gennativetable
-
-CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
-
-$(srcdir)/native.c: nativetable.inc
-
-nativetable.inc: $(CACAO_VM_ZIP) $(CLASSPATH_GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
-       echo    $(GENNATIVETABLE) -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc
-       if `$(GENNATIVETABLE) -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc` ; then true; else rm -f $(top_builddir)/src/native/nativetable.inc; exit 1; fi
-endif
-
 noinst_LTLIBRARIES = libnative.la
 
 if ENABLE_JNI
 JNI_SOURCES = \
-       jni.c \
-       jni.h \
-       localref.c \
-       localref.h
+       jni.cpp \
+       jni.hpp \
+       localref.cpp \
+       localref.hpp
 endif
 
 libnative_la_SOURCES = \
        $(JNI_SOURCES) \
        llni.c \
        llni.h \
-       native.c \
-       native.h
+       native.cpp \
+       native.hpp
 
 libnative_la_LIBADD = \
        vm/libnativevm.la \