X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fnative%2FMakefile.am;h=1a9d117f2b07a5f9cd756121dc6b4e3a8e7081bd;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=64a3de697caf45454c89f3b5f4cee76ec6a34f25;hpb=37314bf42891b640b9570d3dee3449f6a4ab63bf;p=cacao.git

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 64a3de697..1a9d117f2 100644
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -1,6 +1,6 @@
 ## src/native/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
@@ -21,41 +21,50 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## Contact: cacao@cacaojvm.org
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 4417 2006-02-03 22:24:55Z twisti $
 
-## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)/src
+
+LIBS =
 
 SUBDIRS = \
 	include \
 	vm
 
-CLEANFILES =
+CLEANFILES = \
+	nativetable.inc
 
 if ENABLE_JVMTI
 SUBDIRS += jvmti
 JVMTI_LIB = jvmti/libjvmti.la
 endif
 
-if ENABLE_STATICVM
+if WITH_STATIC_CLASSPATH
 SUBDIRS += tools
-CLEANFILES += nativetable.inc
+
+GENNATIVETABLE=$(top_builddir)/src/native/tools/gennativetable
+
+CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
 
 $(srcdir)/native.c: nativetable.inc
 
+nativetable.inc: $(CACAO_VM_ZIP) $(CLASSPATH_GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
+	echo	$(GENNATIVETABLE) -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc
+	if `$(GENNATIVETABLE) -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc` ; then true; else rm -f $(top_builddir)/src/native/nativetable.inc; exit 1; fi
+endif
+
 noinst_LTLIBRARIES = libnative.la
 
-libnative_la_SOURCES = \
+if ENABLE_JNI
+JNI_SOURCES = \
 	jni.c \
 	jni.h \
+	localref.c \
+	localref.h
+endif
+
+libnative_la_SOURCES = \
+	$(JNI_SOURCES) \
 	native.c \
 	native.h
 
@@ -63,20 +72,6 @@ libnative_la_LIBADD = \
 	vm/libnativevm.la \
 	$(JVMTI_LIB)
 
-if ENABLE_ZLIB
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
-else
-VM_ZIP = $(top_builddir)/src/lib/classes/
-endif
-
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ)
-
-CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
-
-nativetable.inc: $(VM_ZIP) $(GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
-	$(top_builddir)/src/native/tools/gennativetable -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc
-endif
-
 
 ## Local variables:
 ## mode: Makefile