From 1e1af4b45a7c882183eb89067c33e86cd85c8aa9 Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Tue, 18 Mar 2008 13:45:55 +0100 Subject: [PATCH] * configure.ac (AC_CONFIG_FILES): Removed src/lib/Makefile, added src/classes/Makefile. * m4/classpath.m4 (AC_CHECK_WITH_CLASSPATH_CLASSES): Fixed BOOTCLASSPATH. * src/Makefile.am (DIST_SUBDIRS): Removed lib, added classes. (SUBDIRS): Likewise. * src/classes/Makefile.am, src/classes/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java, src/classes/gnu/gnu/classpath/VMStackWalker.java, src/classes/gnu/gnu/classpath/VMSystemProperties.java, src/classes/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java, src/classes/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java, src/classes/gnu/java/lang/VMClassLoader.java, src/classes/gnu/java/lang/VMString.java, src/classes/gnu/java/lang/VMThread.java, src/classes/gnu/java/lang/reflect/Constructor.java, src/classes/gnu/java/lang/reflect/Field.java, src/classes/gnu/java/lang/reflect/Method.java, src/classes/gnu/java/security/VMAccessController.java, src/classes/gnu/sun/misc/Unsafe.java, src/classes/gnu/sun/reflect/ConstantPool.java, src/classes/gnu/sun/reflect/annotation/AnnotationParser.java, src/classes/gnu/sun/reflect/annotation/AnnotationType.java, src/classes/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java, src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java, src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java, src/classes/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java, src/native/include/Makefile.am: Moved from lib. * src/lib/Makefile.am, src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java, src/lib/gnu/gnu/classpath/VMStackWalker.java, src/lib/gnu/gnu/classpath/VMSystemProperties.java, src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java, src/lib/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java, src/lib/gnu/java/lang/VMClassLoader.java, src/lib/gnu/java/lang/VMString.java, src/lib/gnu/java/lang/VMThread.java, src/lib/gnu/java/lang/reflect/Constructor.java, src/lib/gnu/java/lang/reflect/Field.java, src/lib/gnu/java/lang/reflect/Method.java, src/lib/gnu/java/security/VMAccessController.java, src/lib/gnu/sun/misc/Unsafe.java, src/lib/gnu/sun/reflect/ConstantPool.java, src/lib/gnu/sun/reflect/annotation/AnnotationParser.java, src/lib/gnu/sun/reflect/annotation/AnnotationType.java, src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java, src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java, src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java, src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java: Moved to lib. --HG-- rename : src/lib/Makefile.am => src/classes/Makefile.am rename : src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java => src/classes/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java rename : src/lib/gnu/gnu/classpath/VMStackWalker.java => src/classes/gnu/gnu/classpath/VMStackWalker.java rename : src/lib/gnu/gnu/classpath/VMSystemProperties.java => src/classes/gnu/gnu/classpath/VMSystemProperties.java rename : src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java => src/classes/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java rename : src/lib/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java => src/classes/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java rename : src/lib/gnu/java/lang/VMClassLoader.java => src/classes/gnu/java/lang/VMClassLoader.java rename : src/lib/gnu/java/lang/VMString.java => src/classes/gnu/java/lang/VMString.java rename : src/lib/gnu/java/lang/VMThread.java => src/classes/gnu/java/lang/VMThread.java rename : src/lib/gnu/java/lang/reflect/Constructor.java => src/classes/gnu/java/lang/reflect/Constructor.java rename : src/lib/gnu/java/lang/reflect/Field.java => src/classes/gnu/java/lang/reflect/Field.java rename : src/lib/gnu/java/lang/reflect/Method.java => src/classes/gnu/java/lang/reflect/Method.java rename : src/lib/gnu/java/security/VMAccessController.java => src/classes/gnu/java/security/VMAccessController.java rename : src/lib/gnu/sun/misc/Unsafe.java => src/classes/gnu/sun/misc/Unsafe.java rename : src/lib/gnu/sun/reflect/ConstantPool.java => src/classes/gnu/sun/reflect/ConstantPool.java rename : src/lib/gnu/sun/reflect/annotation/AnnotationParser.java => src/classes/gnu/sun/reflect/annotation/AnnotationParser.java rename : src/lib/gnu/sun/reflect/annotation/AnnotationType.java => src/classes/gnu/sun/reflect/annotation/AnnotationType.java rename : src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java rename : src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java rename : src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java rename : src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java => src/classes/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java --- configure.ac | 2 +- m4/classpath.m4 | 2 +- src/Makefile.am | 4 +- src/{lib => classes}/Makefile.am | 42 +++++++++---------- .../com/sun/cldchi/jvm/FileDescriptor.java | 0 .../gnu/gnu/classpath/VMStackWalker.java | 0 .../gnu/gnu/classpath/VMSystemProperties.java | 0 .../lang/management/VMMemoryMXBeanImpl.java | 0 .../lang/management/VMRuntimeMXBeanImpl.java | 0 .../gnu/java/lang/VMClassLoader.java | 0 .../gnu/java/lang/VMString.java | 0 .../gnu/java/lang/VMThread.java | 0 .../gnu/java/lang/reflect/Constructor.java | 0 .../gnu/java/lang/reflect/Field.java | 0 .../gnu/java/lang/reflect/Method.java | 0 .../gnu/java/security/VMAccessController.java | 0 src/{lib => classes}/gnu/sun/misc/Unsafe.java | 0 .../gnu/sun/reflect/ConstantPool.java | 0 .../reflect/annotation/AnnotationParser.java | 0 .../reflect/annotation/AnnotationType.java | 0 .../AnnotationTypeMismatchExceptionProxy.java | 0 .../EnumConstantNotPresentExceptionProxy.java | 0 .../reflect/annotation/ExceptionProxy.java | 0 .../TypeNotPresentExceptionProxy.java | 0 src/native/include/Makefile.am | 23 ++++------ 25 files changed, 34 insertions(+), 39 deletions(-) rename src/{lib => classes}/Makefile.am (58%) rename src/{lib => classes}/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java (100%) rename src/{lib => classes}/gnu/gnu/classpath/VMStackWalker.java (100%) rename src/{lib => classes}/gnu/gnu/classpath/VMSystemProperties.java (100%) rename src/{lib => classes}/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java (100%) rename src/{lib => classes}/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java (100%) rename src/{lib => classes}/gnu/java/lang/VMClassLoader.java (100%) rename src/{lib => classes}/gnu/java/lang/VMString.java (100%) rename src/{lib => classes}/gnu/java/lang/VMThread.java (100%) rename src/{lib => classes}/gnu/java/lang/reflect/Constructor.java (100%) rename src/{lib => classes}/gnu/java/lang/reflect/Field.java (100%) rename src/{lib => classes}/gnu/java/lang/reflect/Method.java (100%) rename src/{lib => classes}/gnu/java/security/VMAccessController.java (100%) rename src/{lib => classes}/gnu/sun/misc/Unsafe.java (100%) rename src/{lib => classes}/gnu/sun/reflect/ConstantPool.java (100%) rename src/{lib => classes}/gnu/sun/reflect/annotation/AnnotationParser.java (100%) rename src/{lib => classes}/gnu/sun/reflect/annotation/AnnotationType.java (100%) rename src/{lib => classes}/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java (100%) rename src/{lib => classes}/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java (100%) rename src/{lib => classes}/gnu/sun/reflect/annotation/ExceptionProxy.java (100%) rename src/{lib => classes}/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java (100%) diff --git a/configure.ac b/configure.ac index 60bc74682..fcbd64940 100644 --- a/configure.ac +++ b/configure.ac @@ -845,8 +845,8 @@ AC_CONFIG_FILES([Makefile] [src/Makefile] [src/cacao/Makefile] [src/cacaoh/Makefile] + [src/classes/Makefile] [src/fdlibm/Makefile] - [src/lib/Makefile] [src/mm/Makefile] [src/mm/cacao-gc/Makefile] [src/native/Makefile] diff --git a/m4/classpath.m4 b/m4/classpath.m4 index ff3166737..5091d7e3d 100644 --- a/m4/classpath.m4 +++ b/m4/classpath.m4 @@ -96,7 +96,7 @@ AC_SUBST(CLASSPATH_CLASSES) dnl define BOOTCLASSPATH for Makefiles case "${WITH_CLASSPATH}" in cldc1.1 | gnu) - BOOTCLASSPATH="\$(top_builddir)/src/lib/classes:\$(CLASSPATH_CLASSES)" + BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(CLASSPATH_CLASSES)" ;; *) BOOTCLASSPATH="\$(CLASSPATH_CLASSES)" diff --git a/src/Makefile.am b/src/Makefile.am index 351dfc691..5dd0a6b18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,8 +24,8 @@ DIST_SUBDIRS = \ cacao \ cacaoh \ + classes \ fdlibm \ - lib \ mm \ native \ scripts \ @@ -50,7 +50,7 @@ SUBDIRS = \ toolbox \ vmcore \ $(CACAOH_DIR) \ - lib \ + classes \ native \ fdlibm \ mm \ diff --git a/src/lib/Makefile.am b/src/classes/Makefile.am similarity index 58% rename from src/lib/Makefile.am rename to src/classes/Makefile.am index 6f7d6bced..c1f878c06 100644 --- a/src/lib/Makefile.am +++ b/src/classes/Makefile.am @@ -29,32 +29,32 @@ EXTRA_DIST = \ CLEANFILES = vm.zip VM_JAVA_FILES_GNU = \ - $(top_srcdir)/src/lib/gnu/gnu/classpath/VMStackWalker.java \ - $(top_srcdir)/src/lib/gnu/gnu/classpath/VMSystemProperties.java \ - $(top_srcdir)/src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java \ - $(top_srcdir)/src/lib/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java \ - $(top_srcdir)/src/lib/gnu/java/lang/VMClassLoader.java \ - $(top_srcdir)/src/lib/gnu/java/lang/VMString.java \ - $(top_srcdir)/src/lib/gnu/java/lang/VMThread.java \ - $(top_srcdir)/src/lib/gnu/java/lang/reflect/Constructor.java \ - $(top_srcdir)/src/lib/gnu/java/lang/reflect/Field.java \ - $(top_srcdir)/src/lib/gnu/java/lang/reflect/Method.java \ - $(top_srcdir)/src/lib/gnu/java/security/VMAccessController.java \ - $(top_srcdir)/src/lib/gnu/sun/misc/Unsafe.java + $(top_srcdir)/src/classes/gnu/gnu/classpath/VMStackWalker.java \ + $(top_srcdir)/src/classes/gnu/gnu/classpath/VMSystemProperties.java \ + $(top_srcdir)/src/classes/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java \ + $(top_srcdir)/src/classes/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java \ + $(top_srcdir)/src/classes/gnu/java/lang/VMClassLoader.java \ + $(top_srcdir)/src/classes/gnu/java/lang/VMString.java \ + $(top_srcdir)/src/classes/gnu/java/lang/VMThread.java \ + $(top_srcdir)/src/classes/gnu/java/lang/reflect/Constructor.java \ + $(top_srcdir)/src/classes/gnu/java/lang/reflect/Field.java \ + $(top_srcdir)/src/classes/gnu/java/lang/reflect/Method.java \ + $(top_srcdir)/src/classes/gnu/java/security/VMAccessController.java \ + $(top_srcdir)/src/classes/gnu/sun/misc/Unsafe.java VM_JAVA_FILES_GNU_ANNOTATIONS = \ - $(top_srcdir)/src/lib/gnu/sun/reflect/ConstantPool.java \ - $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java \ - $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java \ - $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java \ - $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java \ - $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/AnnotationType.java \ - $(top_srcdir)/src/lib/gnu/sun/reflect/annotation/AnnotationParser.java + $(top_srcdir)/src/classes/gnu/sun/reflect/ConstantPool.java \ + $(top_srcdir)/src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java \ + $(top_srcdir)/src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java \ + $(top_srcdir)/src/classes/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java \ + $(top_srcdir)/src/classes/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java \ + $(top_srcdir)/src/classes/gnu/sun/reflect/annotation/AnnotationType.java \ + $(top_srcdir)/src/classes/gnu/sun/reflect/annotation/AnnotationParser.java VM_JAVA_FILES_CLDC1_1 = \ - $(top_srcdir)/src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java + $(top_srcdir)/src/classes/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java -BOOTCLASSPATH = $(top_builddir)/src/lib/classes:$(CLASSPATH_CLASSES) +BOOTCLASSPATH = $(top_builddir)/src/classes/classes:$(CLASSPATH_CLASSES) if WITH_CLASSPATH_GNU VM_JAVA_FILES = \ diff --git a/src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java b/src/classes/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java similarity index 100% rename from src/lib/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java rename to src/classes/cldc1.1/com/sun/cldchi/jvm/FileDescriptor.java diff --git a/src/lib/gnu/gnu/classpath/VMStackWalker.java b/src/classes/gnu/gnu/classpath/VMStackWalker.java similarity index 100% rename from src/lib/gnu/gnu/classpath/VMStackWalker.java rename to src/classes/gnu/gnu/classpath/VMStackWalker.java diff --git a/src/lib/gnu/gnu/classpath/VMSystemProperties.java b/src/classes/gnu/gnu/classpath/VMSystemProperties.java similarity index 100% rename from src/lib/gnu/gnu/classpath/VMSystemProperties.java rename to src/classes/gnu/gnu/classpath/VMSystemProperties.java diff --git a/src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java b/src/classes/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java similarity index 100% rename from src/lib/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java rename to src/classes/gnu/gnu/java/lang/management/VMMemoryMXBeanImpl.java diff --git a/src/lib/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java b/src/classes/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java similarity index 100% rename from src/lib/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java rename to src/classes/gnu/gnu/java/lang/management/VMRuntimeMXBeanImpl.java diff --git a/src/lib/gnu/java/lang/VMClassLoader.java b/src/classes/gnu/java/lang/VMClassLoader.java similarity index 100% rename from src/lib/gnu/java/lang/VMClassLoader.java rename to src/classes/gnu/java/lang/VMClassLoader.java diff --git a/src/lib/gnu/java/lang/VMString.java b/src/classes/gnu/java/lang/VMString.java similarity index 100% rename from src/lib/gnu/java/lang/VMString.java rename to src/classes/gnu/java/lang/VMString.java diff --git a/src/lib/gnu/java/lang/VMThread.java b/src/classes/gnu/java/lang/VMThread.java similarity index 100% rename from src/lib/gnu/java/lang/VMThread.java rename to src/classes/gnu/java/lang/VMThread.java diff --git a/src/lib/gnu/java/lang/reflect/Constructor.java b/src/classes/gnu/java/lang/reflect/Constructor.java similarity index 100% rename from src/lib/gnu/java/lang/reflect/Constructor.java rename to src/classes/gnu/java/lang/reflect/Constructor.java diff --git a/src/lib/gnu/java/lang/reflect/Field.java b/src/classes/gnu/java/lang/reflect/Field.java similarity index 100% rename from src/lib/gnu/java/lang/reflect/Field.java rename to src/classes/gnu/java/lang/reflect/Field.java diff --git a/src/lib/gnu/java/lang/reflect/Method.java b/src/classes/gnu/java/lang/reflect/Method.java similarity index 100% rename from src/lib/gnu/java/lang/reflect/Method.java rename to src/classes/gnu/java/lang/reflect/Method.java diff --git a/src/lib/gnu/java/security/VMAccessController.java b/src/classes/gnu/java/security/VMAccessController.java similarity index 100% rename from src/lib/gnu/java/security/VMAccessController.java rename to src/classes/gnu/java/security/VMAccessController.java diff --git a/src/lib/gnu/sun/misc/Unsafe.java b/src/classes/gnu/sun/misc/Unsafe.java similarity index 100% rename from src/lib/gnu/sun/misc/Unsafe.java rename to src/classes/gnu/sun/misc/Unsafe.java diff --git a/src/lib/gnu/sun/reflect/ConstantPool.java b/src/classes/gnu/sun/reflect/ConstantPool.java similarity index 100% rename from src/lib/gnu/sun/reflect/ConstantPool.java rename to src/classes/gnu/sun/reflect/ConstantPool.java diff --git a/src/lib/gnu/sun/reflect/annotation/AnnotationParser.java b/src/classes/gnu/sun/reflect/annotation/AnnotationParser.java similarity index 100% rename from src/lib/gnu/sun/reflect/annotation/AnnotationParser.java rename to src/classes/gnu/sun/reflect/annotation/AnnotationParser.java diff --git a/src/lib/gnu/sun/reflect/annotation/AnnotationType.java b/src/classes/gnu/sun/reflect/annotation/AnnotationType.java similarity index 100% rename from src/lib/gnu/sun/reflect/annotation/AnnotationType.java rename to src/classes/gnu/sun/reflect/annotation/AnnotationType.java diff --git a/src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java b/src/classes/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java similarity index 100% rename from src/lib/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java rename to src/classes/gnu/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java diff --git a/src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java b/src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java similarity index 100% rename from src/lib/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java rename to src/classes/gnu/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java diff --git a/src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java b/src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java similarity index 100% rename from src/lib/gnu/sun/reflect/annotation/ExceptionProxy.java rename to src/classes/gnu/sun/reflect/annotation/ExceptionProxy.java diff --git a/src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java b/src/classes/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java similarity index 100% rename from src/lib/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java rename to src/classes/gnu/sun/reflect/annotation/TypeNotPresentExceptionProxy.java diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am index fb85c4fb3..3303e3531 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, 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. ## @@ -23,6 +21,9 @@ ## 02110-1301, USA. +JAVAH = $(CACAOH) +JAVAHCMD = $(JAVAH) -bootclasspath $(BOOTCLASSPATH) + COMMON_HEADER_FILES = \ java_lang_Class.h \ java_lang_Object.h \ @@ -146,25 +147,19 @@ DO_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) +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 +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: -- 2.25.1