X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fnative%2Finclude%2FMakefile.am;h=28a29873cc7737d4326ee4b8c1c505112d882db6;hb=7997b6d4e166c1e993f66f2fef0cffbf778072cd;hp=497f74833773f1aa2bd7da944b2f1d6a29663df5;hpb=ac6f775707a37a0c6769f094f0a58de0f0641d5a;p=cacao.git diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am index 497f74833..28a29873c 100644 --- 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 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,134 +19,94 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301, USA. -## -## Contact: cacao@cacaojvm.org -## -## Authors: Christian Thalinger -## -## Changes: -## -## $Id: Makefile.am 5146 2006-07-17 13:50:35Z twisti $ - -## Process this file with automake to produce Makefile.in - -NO_GEN_HEADER_FILES = \ - java_lang_Class.h \ - java_lang_ClassLoader.h \ - java_lang_Cloneable.h \ - java_lang_Object.h \ - java_lang_String.h \ - java_lang_Thread.h \ - java_lang_ThreadGroup.h \ - java_lang_Throwable.h \ - java_lang_VMObject.h \ - java_lang_VMThread.h \ - java_lang_VMThrowable.h \ - java_util_Properties.h -GEN_HEADER_FILES = \ - java_io_InputStream.h \ - java_io_PrintStream.h \ - \ - gnu_classpath_Pointer.h \ - gnu_classpath_Pointer32.h \ - gnu_classpath_Pointer64.h \ - java_io_File.h \ - java_lang_Boolean.h \ - java_lang_Byte.h \ - java_lang_Character.h \ - java_lang_Double.h \ - java_lang_Float.h \ - java_lang_Integer.h \ - java_lang_Long.h \ - java_lang_Process.h \ - java_lang_Short.h \ - java_lang_StackTraceElement.h \ - java_lang_reflect_Constructor.h \ - java_lang_reflect_Field.h \ - java_lang_reflect_Method.h \ - java_nio_Buffer.h \ - java_nio_DirectByteBufferImpl.h \ - java_security_ProtectionDomain.h \ - java_util_Vector.h -GEN_JVMTI_HEADER_FILES = \ - gnu_classpath_jdwp_VMFrame.h \ - gnu_classpath_jdwp_VMMethod.h \ - gnu_classpath_jdwp_VMVirtualMachine.h \ - gnu_classpath_jdwp_event_EventRequest.h \ - gnu_classpath_jdwp_util_VariableTable.h \ - java_nio_ByteBuffer.h +JAVAH = javah +JAVAHCMD = $(JAVAH) -jni -bootclasspath $(BOOTCLASSPATH) +if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1 +IMPLEMENTED_VM_CLASSES_HEADER_FILES = \ + com_sun_cldc_io_ResourceInputStream.h \ + com_sun_cldc_io_j2me_socket_Protocol.h \ + com_sun_cldchi_io_ConsoleOutputStream.h \ + com_sun_cldchi_jvm_FileDescriptor.h \ + com_sun_cldchi_jvm_JVM.h \ + java_lang_Class.h \ + java_lang_Math.h \ + java_lang_Runtime.h \ + java_lang_System.h +endif -ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \ +if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH +IMPLEMENTED_VM_CLASSES_HEADER_FILES = \ gnu_classpath_VMStackWalker.h \ gnu_classpath_VMSystemProperties.h \ + gnu_java_lang_VMCPStringBuilder.h \ + gnu_java_lang_management_VMClassLoadingMXBeanImpl.h \ + gnu_java_lang_management_VMMemoryMXBeanImpl.h \ gnu_java_lang_management_VMRuntimeMXBeanImpl.h \ + gnu_java_lang_management_VMThreadMXBeanImpl.h \ java_lang_VMClass.h \ java_lang_VMClassLoader.h \ + java_lang_VMObject.h \ java_lang_VMRuntime.h \ java_lang_VMString.h \ java_lang_VMSystem.h \ + java_lang_VMThread.h \ + java_lang_VMThrowable.h \ + java_lang_management_VMManagementFactory.h \ + java_lang_reflect_VMConstructor.h \ + java_lang_reflect_VMField.h \ + java_lang_reflect_VMMethod.h \ java_lang_reflect_VMProxy.h \ - java_security_VMAccessController.h + java_security_VMAccessController.h \ + java_util_concurrent_atomic_AtomicLong.h \ + sun_misc_Unsafe.h -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 +if ENABLE_ANNOTATIONS +IMPLEMENTED_VM_CLASSES_HEADER_FILES += \ + sun_reflect_ConstantPool.h +endif +endif -CLEANFILES = \ - $(GEN_HEADER_FILES) \ - $(GEN_JVMTI_HEADER_FILES) \ - $(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES) \ - $(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES) +if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK +IMPLEMENTED_VM_CLASSES_HEADER_FILES = \ + sun_misc_Unsafe.h +endif -noinst_HEADERS = \ - $(NO_GEN_HEADER_FILES) +if ENABLE_JVMTI +JVMTI_HEADER_FILES = \ + gnu_classpath_jdwp_VMFrame.h \ + gnu_classpath_jdwp_VMMethod.h \ + gnu_classpath_jdwp_VMVirtualMachine.h \ + gnu_classpath_jdwp_event_EventRequest.h \ + gnu_classpath_jdwp_util_VariableTable.h +endif + +CLEANFILES = \ + *.h DO_HEADER_FILES = \ - $(GEN_HEADER_FILES) \ - $(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES) + $(IMPLEMENTED_VM_CLASSES_HEADER_FILES) -if ENABLE_JVMTI -DO_HEADER_FILES += \ - $(GEN_JVMTI_HEADER_FILES) +if WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH +if ENABLE_ZLIB +VM_ZIP = $(top_builddir)/src/classes/vm.zip endif - -if WITH_STATIC_CLASSPATH -DO_HEADER_FILES += \ - $(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES) endif -CACAOH = $(top_builddir)/src/cacaoh/cacaoh - -CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP) -VM_ZIP = $(top_builddir)/src/lib/vm.zip +if WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1 +if ENABLE_ZLIB +VM_ZIP = $(top_builddir)/src/classes/vm.zip +endif +endif noinst_DATA = $(DO_HEADER_FILES) -genall: $(NO_GEN_HEADER_FILES) - -$(NO_GEN_HEADER_FILES): - @class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \ - echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \ - $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class - -$(DO_HEADER_FILES): $(VM_ZIP) $(CLASSPATH_GLIBJ_ZIP) +$(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: