* Removed all Id tags.

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

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index ae3de7570a42e79e5dfb76ae39a41a6cf53d6d65..1a9d117f2b07a5f9cd756121dc6b4e3a8e7081bd 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -1,9 +1,9 @@
 ## src/native/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.
 ##
@@ -19,53 +19,60 @@
 ##
 ## 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.
-##
-## Contact: cacao@complang.tuwien.ac.at
-##
-## Authors: Christian Thalinger
-##
-## Changes:
-##
-## $Id: Makefile.am 4218 2006-01-17 16:55:21Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
+
 
-## 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_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir)/src
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_builddir)/src
+LIBS =
 
-SUBDIRS = include vm
+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: $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable
-       BOOTCLASSPATH=$(CLASSPATH_PREFIX)/share/classpath/$(GLIBJZ) $(top_builddir)/src/native/tools/gennativetable > $(top_builddir)/src/native/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 \
-       nativecalls.inc
+       native.h
 
 libnative_la_LIBADD = \
        vm/libnativevm.la \
        $(JVMTI_LIB)
 
+
 ## Local variables:
 ## mode: Makefile
 ## indent-tabs-mode: t