* m4/classpath.m4: Renamed --with-classpath* options to

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

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index a3f492268ceb48a9d9a6fce359a77a81bfba969f..bdecd1eef2815c7ba5229abb617756eb74931e8c 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -1,9 +1,7 @@
 ## src/native/include/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,10 @@
 ## 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 8347 2007-08-18 13:04:59Z twisti $
 
-## Process this file with automake to produce Makefile.in
+
+JAVAH    = $(CACAOH)
+JAVAHCMD = $(JAVAH) -bootclasspath $(BOOTCLASSPATH)
 
 COMMON_HEADER_FILES = \
        java_lang_Class.h \
@@ -60,10 +58,12 @@ JAVASE_HEADER_FILES = \
        java_lang_reflect_Method.h \
        java_nio_Buffer.h \
        java_security_ProtectionDomain.h \
+       java_util_HashMap.h \
+       java_util_Map.h \
        java_util_concurrent_atomic_AtomicLong.h \
        sun_misc_Unsafe.h
 
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
 JAVASE_HEADER_FILES += \
        java_lang_VMThread.h \
        java_lang_VMThrowable.h \
@@ -71,7 +71,11 @@ JAVASE_HEADER_FILES += \
        gnu_classpath_Pointer.h \
        gnu_classpath_Pointer32.h \
        gnu_classpath_Pointer64.h \
+       gnu_java_lang_VMCPStringBuilder.h \
        java_lang_VMObject.h \
+       java_lang_reflect_VMConstructor.h \
+       java_lang_reflect_VMField.h \
+       java_lang_reflect_VMMethod.h \
        java_nio_DirectByteBufferImpl.h
 
 if ENABLE_ANNOTATIONS
@@ -80,7 +84,7 @@ JAVASE_HEADER_FILES += \
 endif
 endif
 
-if WITH_CLASSPATH_SUN
+if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
 JAVASE_HEADER_FILES += \
        java_lang_AssertionStatusDirectives.h \
        java_nio_ByteBuffer.h \
@@ -104,7 +108,7 @@ JVMTI_HEADER_FILES = \
        gnu_classpath_jdwp_event_EventRequest.h \
        gnu_classpath_jdwp_util_VariableTable.h
 
-if WITH_CLASSPATH_GNU
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
 ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
        gnu_classpath_VMStackWalker.h \
        gnu_classpath_VMSystemProperties.h \
@@ -124,21 +128,6 @@ ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
        java_security_VMAccessController.h
 endif
 
-ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES = \
-       java_net_DatagramPacket.h \
-       java_net_InetAddress.h \
-       \
-       gnu_java_net_PlainDatagramSocketImpl.h \
-       gnu_java_net_PlainSocketImpl.h \
-       gnu_java_nio_PipeImpl.h \
-       gnu_java_nio_channels_FileChannelImpl.h \
-       gnu_java_nio_charset_iconv_IconvEncoder.h \
-       gnu_java_nio_charset_iconv_IconvDecoder.h \
-       java_lang_VMProcess.h \
-       java_net_SocketImpl.h \
-       java_nio_MappedByteBufferImpl.h \
-       java_nio_channels_spi_SelectorProvider.h
-
 CLEANFILES = \
        *.h
 
@@ -161,31 +150,20 @@ DO_HEADER_FILES += \
        $(GEN_JVMTI_HEADER_FILES)
 endif
 
-if WITH_STATIC_CLASSPATH
-DO_HEADER_FILES += \
-       $(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES)
-endif
-
-if WITH_CLASSPATH_GNU
-CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
-endif
-
-if WITH_CLASSPATH_SUN
-CLASSPATH = $(CLASSPATH_CLASSES)
+if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH
+VM_ZIP = $(top_builddir)/src/classes/vm.zip
 endif
 
-if WITH_CLASSPATH_CLDC1_1
-CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
+if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1
+VM_ZIP = $(top_builddir)/src/classes/vm.zip
 endif
 
 noinst_DATA = $(DO_HEADER_FILES)
 
 $(DO_HEADER_FILES): $(CACAOH) $(VM_ZIP) $(CLASSPATH_CLASSES)
        @class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
-       echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
-       $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
+       echo "$(JAVAHCMD) -d . $$class"; \
+       $(JAVAHCMD) -d . $$class
 
 
 ## Local variables: