* VM_ZIP, GLIBJ_ZIP: Added.

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

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 121c504f345d41776898e9c2ac8707606ed06c32..a676656bea91daf6225b6593f8876d50ed975ff1 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3011 2005-07-12 21:02:41Z twisti $
+## $Id: Makefile.am 3389 2005-10-07 15:35:38Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -48,7 +48,9 @@ GEN_HEADER_FILES = \
        java_io_InputStream.h \
        java_io_PrintStream.h \
        \
-       gnu_classpath_RawData.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 \
@@ -60,10 +62,13 @@ GEN_HEADER_FILES = \
        java_lang_Long.h \
        java_lang_Process.h \
        java_lang_Short.h \
+       java_lang_StackTraceElement.h \
        java_lang_VMThrowable.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
 
@@ -75,7 +80,7 @@ ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
        java_lang_VMRuntime.h \
        java_lang_VMString.h \
        java_lang_VMSystem.h \
-       java_lang_reflect_Proxy.h \
+       java_lang_reflect_VMProxy.h \
        java_security_VMAccessController.h
 
 ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES = \
@@ -112,11 +117,10 @@ endif
 
 CACAOH = $(top_builddir)/src/cacaoh/cacaoh
 
-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)
 
 all: $(DO_HEADER_FILES)
 
@@ -125,7 +129,7 @@ $(NO_GEN_HEADER_FILES):
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
 
-$(DO_HEADER_FILES):
+$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
        @class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class