* Removed all Id tags.

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

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 4da573e9a64972bb9a88512419ea324bb299c1ca..eb4e7f9228b59e447e1b6e6dc2587cb3b68032ce 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -21,10 +21,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## $Id: Makefile.am 7246 2007-01-29 18:49:05Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
 COMMON_HEADER_FILES = \
        java_lang_Class.h \
@@ -50,27 +47,49 @@ 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_concurrent_atomic_AtomicLong.h \
        sun_misc_Unsafe.h
 
+if WITH_CLASSPATH_GNU
+JAVASE_HEADER_FILES += \
+       java_lang_VMThread.h \
+       java_lang_VMThrowable.h \
+       \
+       gnu_classpath_Pointer.h \
+       gnu_classpath_Pointer32.h \
+       gnu_classpath_Pointer64.h \
+       java_lang_VMObject.h \
+       java_nio_DirectByteBufferImpl.h
+
+if ENABLE_ANNOTATIONS
+JAVASE_HEADER_FILES += \
+       sun_reflect_ConstantPool.h
+endif
+endif
+
+if WITH_CLASSPATH_SUN
+JAVASE_HEADER_FILES += \
+       java_lang_AssertionStatusDirectives.h \
+       java_nio_ByteBuffer.h \
+       sun_reflect_ConstantPool.h
+endif
+
 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_FileDescriptor.h \
+       com_sun_cldchi_jvm_JVM.h \
        java_lang_Math.h \
        java_lang_Runtime.h \
        java_lang_System.h
@@ -80,9 +99,9 @@ JVMTI_HEADER_FILES = \
        gnu_classpath_jdwp_VMMethod.h \
        gnu_classpath_jdwp_VMVirtualMachine.h \
        gnu_classpath_jdwp_event_EventRequest.h \
-       gnu_classpath_jdwp_util_VariableTable.h \
-       java_nio_ByteBuffer.h
+       gnu_classpath_jdwp_util_VariableTable.h
 
+if WITH_CLASSPATH_GNU
 ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
        gnu_classpath_VMStackWalker.h \
        gnu_classpath_VMSystemProperties.h \
@@ -95,11 +114,12 @@ ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
        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_management_VMManagementFactory.h \
        java_lang_reflect_VMProxy.h \
        java_security_VMAccessController.h
+endif
 
 ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES = \
        java_net_DatagramPacket.h \
@@ -117,12 +137,7 @@ ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES = \
        java_nio_channels_spi_SelectorProvider.h
 
 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)
+       *.h
 
 DO_HEADER_FILES = \
        $(COMMON_HEADER_FILES)
@@ -148,15 +163,20 @@ 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
-else
+endif
+
+if WITH_CLASSPATH_SUN
 CLASSPATH = $(CLASSPATH_CLASSES)
 endif
 
+if WITH_CLASSPATH_CLDC1_1
+CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_CLASSES)
+VM_ZIP = $(top_builddir)/src/lib/vm.zip
+endif
+
 noinst_DATA = $(DO_HEADER_FILES)
 
 $(DO_HEADER_FILES): $(CACAOH) $(VM_ZIP) $(CLASSPATH_CLASSES)