X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnative%2Finclude%2FMakefile.am;h=a0c92b91cc154461db951f7a7019f2e0893458a8;hb=920e05632c8bf7a2da10898cb508356e86284aed;hp=23b469b69a059053e21e37a05d9f2fb125719768;hpb=66c0aff0dd22d57a813ed61150086d665561dd2c;p=cacao.git

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 23b469b69..a0c92b91c 100644
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -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 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.
 ##
@@ -19,20 +19,21 @@
 ##
 ## 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
+## Contact: cacao@cacaojvm.org
 ##
 ## Authors: Christian Thalinger
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 3536 2005-11-03 20:08:26Z twisti $
+## $Id: Makefile.am 4419 2006-02-03 22:57:32Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 NO_GEN_HEADER_FILES = \
+	java_lang_Class.h \
 	java_lang_ClassLoader.h \
 	java_lang_Cloneable.h \
 	java_lang_Object.h \
@@ -42,10 +43,10 @@ NO_GEN_HEADER_FILES = \
 	java_lang_Throwable.h \
 	java_lang_VMObject.h \
 	java_lang_VMThread.h \
-	java_lang_VMThrowable.h
+	java_lang_VMThrowable.h \
+	java_util_Properties.h
 
 GEN_HEADER_FILES = \
-	java_util_Properties.h \
 	java_io_InputStream.h \
 	java_io_PrintStream.h \
 	\
@@ -56,7 +57,6 @@ GEN_HEADER_FILES = \
 	java_lang_Boolean.h \
 	java_lang_Byte.h \
 	java_lang_Character.h \
-	java_lang_Class.h \
 	java_lang_Double.h \
 	java_lang_Float.h \
 	java_lang_Integer.h \
@@ -70,7 +70,13 @@ GEN_HEADER_FILES = \
 	java_nio_Buffer.h \
 	java_nio_DirectByteBufferImpl.h \
 	java_security_ProtectionDomain.h \
-	java_util_Vector.h
+	java_util_Vector.h 
+
+GEN_JVMTI_HEADER_FILES = \
+	java_nio_ByteBuffer.h \
+	gnu_classpath_jdwp_VMFrame.h \
+	gnu_classpath_jdwp_VMVirtualMachine.h \
+	gnu_classpath_jdwp_event_EventRequest.h
 
 ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES = \
 	gnu_classpath_VMStackWalker.h \
@@ -100,6 +106,7 @@ ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES = \
 
 CLEANFILES = \
 	$(GEN_HEADER_FILES) \
+	$(GEN_JVMTI_HEADER_FILES) \
 	$(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES) \
 	$(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES)
 
@@ -110,6 +117,11 @@ DO_HEADER_FILES = \
 	$(GEN_HEADER_FILES) \
 	$(ADDITIONAL_IMPLEMENTED_VM_CLASSES_HEADER_FILES)
 
+if ENABLE_JVMTI
+DO_HEADER_FILES += \
+	$(GEN_JVMTI_HEADER_FILES)
+endif
+
 if ENABLE_STATICVM
 DO_HEADER_FILES += \
 	$(ADDITIONAL_STATIC_CLASSPATH_HEADER_FILES)
@@ -117,8 +129,8 @@ endif
 
 CACAOH = $(top_builddir)/src/cacaoh/cacaoh
 
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
-GLIBJ_ZIP = $(CLASSPATH_INSTALL_DIR)/share/classpath/glibj.zip
+VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_STRING)
+GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
 
 CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
 
@@ -131,7 +143,8 @@ $(NO_GEN_HEADER_FILES):
 	echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
 	$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
 
-$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
+#$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
+$(DO_HEADER_FILES):
 	@class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
 	echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
 	$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class