java_lang_VMThrowable.h \
java_lang_reflect_Constructor.h \
java_lang_reflect_Field.h \
java_lang_reflect_Method.h \
java_lang_VMThrowable.h \
java_lang_reflect_Constructor.h \
java_lang_reflect_Field.h \
java_lang_reflect_Method.h \
-if WITH_EXTERNAL_CLASSPATH
-CLASSPATH = $(top_builddir)/src/lib/vm.zip:$(EXTERNAL_CLASSPATH_PREFIX)/share/classpath/glibj.zip
-else
-CLASSPATH = $(top_builddir)/src/classpath/lib/
-endif
+VM_ZIP = $(top_builddir)/src/lib/vm.zip
+GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip
+
+CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
@class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
@class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class