Merged revisions 7501-7598 via svnmerge from
[cacao.git] / src / native / include / Makefile.am
index 8f33b23677116c5d3a38d4788334afac14c18470..b7a0c18835f18b6a898607259992d528cdedb92a 100644 (file)
@@ -1,9 +1,9 @@
 ## src/native/include/Makefile.am
 ##
-## Copyright (C) 1996-2005 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 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
 ##
 ## This file is part of CACAO.
 ##
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 ##
-## Contact: cacao@complang.tuwien.ac.at
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 4223 2006-01-17 18:24:31Z 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_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 \
@@ -61,31 +43,64 @@ GEN_HEADER_FILES = \
        java_lang_Float.h \
        java_lang_Integer.h \
        java_lang_Long.h \
-       java_lang_Process.h \
        java_lang_Short.h \
+       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 \
        java_nio_Buffer.h \
        java_nio_DirectByteBufferImpl.h \
        java_security_ProtectionDomain.h \
-       java_util_Vector.h 
-
-GEN_JVMTI_HEADER_FILES = \
-       java_nio_ByteBuffer.h \
+       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
+
+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_event_EventRequest.h \
+       gnu_classpath_jdwp_util_VariableTable.h \
+       java_nio_ByteBuffer.h
 
 ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
        gnu_classpath_VMStackWalker.h \
        gnu_classpath_VMSystemProperties.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_VMRuntime.h \
        java_lang_VMString.h \
        java_lang_VMSystem.h \
+       java_lang_management_VMManagementFactory.h \
+       java_lang_management_MemoryUsage.h \
+       java_lang_management_ThreadInfo.h \
        java_lang_reflect_VMProxy.h \
        java_security_VMAccessController.h
 
@@ -105,45 +120,47 @@ ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES = \
        java_nio_channels_spi_SelectorProvider.h
 
 CLEANFILES = \
-       $(GEN_HEADER_FILES) \
-       $(GEN_JVMTI_HEADER_FILES) \
+       $(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 = \
-       $(GEN_HEADER_FILES) \
+       $(COMMON_HEADER_FILES)
+
+if ENABLE_JAVASE
+DO_HEADER_FILES += \
+       $(JAVASE_HEADER_FILES) \
        $(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES)
+endif
+
+if ENABLE_JAVAME_CLDC1_1
+DO_HEADER_FILES += \
+       $(JAVAME_CLDC1_1_HEADER_FILES)
+endif
 
 if ENABLE_JVMTI
 DO_HEADER_FILES += \
        $(GEN_JVMTI_HEADER_FILES)
 endif
 
-if ENABLE_STATICVM
+if WITH_STATIC_CLASSPATH
 DO_HEADER_FILES += \
        $(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES)
 endif
 
-CACAOH = $(top_builddir)/src/cacaoh/cacaoh
-
+if WITH_CLASSPATH_GNU
+CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
 VM_ZIP = $(top_builddir)/src/lib/vm.zip
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
-
-CLASSPATH = $(VM_ZIP):$(GLIBJ_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): $(VM_ZIP) $(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