* 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 765df9c22388900fc6921257413e363efb2452ac..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 8132 2007-06-22 11:15:47Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
 COMMON_HEADER_FILES = \
        java_lang_Class.h \
@@ -73,18 +70,25 @@ JAVASE_HEADER_FILES += \
        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
+       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 \
@@ -162,10 +166,17 @@ endif
 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)