Merge to subtype-trunk (manually: src/vm/linker.hpp, src/vm/vftbl.hpp)

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

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index fe2403ae51d9e1fbc0d99f88ab2f7424a97bf566..4806f11499a351bbd8eb16c9634bdac073eb4bfa 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -1,9 +1,7 @@
 ## src/native/Makefile.am
 ##
-## 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
+## Copyright (C) 1996-2005, 2006, 2007, 2008
+## CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 ##
 ## This file is part of CACAO.
 ##
@@ -21,55 +19,41 @@
 ## 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 4413 2006-02-03 20:54:16Z 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
 
-SUBDIRS = include vm
+LIBS =
 
-CLEANFILES =
+SUBDIRS = \
+       vm
 
 if ENABLE_JVMTI
 SUBDIRS += jvmti
 JVMTI_LIB = jvmti/libjvmti.la
 endif
 
-if ENABLE_STATICVM
-SUBDIRS += tools
-CLEANFILES += nativetable.inc
-
-$(srcdir)/native.c: nativetable.inc
-
 noinst_LTLIBRARIES = libnative.la
 
+if ENABLE_JNI
+JNI_SOURCES = \
+       jni.cpp \
+       jni.hpp \
+       localref.cpp \
+       localref.hpp
+endif
+
 libnative_la_SOURCES = \
-       jni.c \
-       jni.h \
-       native.c \
-       native.h
+       $(JNI_SOURCES) \
+       llni.c \
+       llni.h \
+       native.cpp \
+       native.hpp
 
 libnative_la_LIBADD = \
        vm/libnativevm.la \
        $(JVMTI_LIB)
 
-VM_ZIP = $(top_builddir)/src/lib/vm.zip
-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