Merged revisions 7501-7598 via svnmerge from

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

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 3e061594a324f5a980519aaf70322a16ed501175..b7a0c18835f18b6a898607259992d528cdedb92a 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -1,6 +1,6 @@
 ## src/native/include/Makefile.am
 ##
-## Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+## 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
@@ -22,31 +22,17 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 ##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## $Id: Makefile.am 6237 2006-12-26 23:26:33Z twisti $
+## $Id: Makefile.am 7596 2007-03-28 21:05:53Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
-NO_GEN_HEADER_FILES = \
+COMMON_HEADER_FILES = \
        java_lang_Class.h \
        java_lang_Object.h \
        java_lang_String.h \
        java_lang_Thread.h \
-       java_lang_Throwable.h
-
-NO_GEN_JAVASE_HEADER_FILES = \
-       java_lang_ClassLoader.h \
-       java_lang_Cloneable.h \
-       java_lang_ThreadGroup.h \
-       java_lang_VMObject.h \
-       java_lang_VMThread.h \
-       java_lang_VMThrowable.h \
-       java_util_Properties.h
-
-COMMON_HEADER_FILES = \
+       java_lang_Throwable.h \
+       \
        java_io_InputStream.h \
        java_io_PrintStream.h \
        \
@@ -61,12 +47,20 @@ COMMON_HEADER_FILES = \
        java_util_Vector.h
 
 JAVASE_HEADER_FILES = \
+       java_lang_ClassLoader.h \
+       java_lang_Cloneable.h \
+       java_lang_ThreadGroup.h \
+       java_lang_VMThread.h \
+       java_lang_VMThrowable.h \
+       java_util_Properties.h \
+       \
        gnu_classpath_Pointer.h \
        gnu_classpath_Pointer32.h \
        gnu_classpath_Pointer64.h \
        java_io_File.h \
        java_lang_Process.h \
        java_lang_StackTraceElement.h \
+       java_lang_VMObject.h \
        java_lang_reflect_Constructor.h \
        java_lang_reflect_Field.h \
        java_lang_reflect_Method.h \
@@ -76,7 +70,10 @@ JAVASE_HEADER_FILES = \
        sun_misc_Unsafe.h
 
 JAVAME_CLDC1_1_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_JVM.h \
        java_lang_Math.h \
        java_lang_Runtime.h \
        java_lang_System.h
@@ -124,20 +121,16 @@ ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES = \
 
 CLEANFILES = \
        $(COMMON_HEADER_FILES) \
+       $(JAVASE_HEADER_FILES) \
+       $(JAVAME_CLDC1_1_HEADER_FILES) \
        $(JVMTI_HEADER_FILES) \
        $(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES) \
        $(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES)
 
-noinst_HEADERS = \
-       $(NO_GEN_HEADER_FILES)
-
 DO_HEADER_FILES = \
        $(COMMON_HEADER_FILES)
 
 if ENABLE_JAVASE
-noinst_HEADERS += \
-       $(NO_GEN_JAVASE_HEADER_FILES)
-
 DO_HEADER_FILES += \
        $(JAVASE_HEADER_FILES) \
        $(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES)
@@ -158,21 +151,16 @@ DO_HEADER_FILES += \
        $(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES)
 endif
 
-CACAOH = $(top_builddir)/src/cacaoh/cacaoh
-
-#CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
-CLASSPATH = $(BOOTCLASSPATH)
+if WITH_CLASSPATH_GNU
+CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+VM_ZIP = $(top_builddir)/src/lib/vm.zip
+else
+CLASSPATH = $(CLASSPATH_CLASSES)
+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): $(CACAOH) $(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