* src/native/vm/sun_misc_Unsafe.cpp: Make both OpenJDK 6/7 versions of

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

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index d9fa49ca69d7dc40f1e5ef4198defb7cf09a5cea..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 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.
 ##
@@ -19,46 +17,42 @@
 ##
 ## 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 2860 2005-06-28 18:37:28Z twisti $
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301, USA.
 
-## Process this file with automake to produce Makefile.in
 
-INCLUDES = -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_STATICVM
-SUBDIRS += tools
-CLEANFILES += nativetable.inc
-
-$(srcdir)/native.c: nativetable.inc
-
-nativetable.inc: $(top_builddir)/src/classpath/lib/rt.jar $(top_builddir)/src/native/tools/gennativetable
-       BOOTCLASSPATH=$(top_builddir)/src/classpath/lib/rt.jar $(top_builddir)/src/native/tools/gennativetable > $(top_builddir)/src/native/nativetable.inc
+if ENABLE_JVMTI
+SUBDIRS += jvmti
+JVMTI_LIB = jvmti/libjvmti.la
 endif
 
 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 \
-       nativecalls.inc
+       $(JNI_SOURCES) \
+       llni.c \
+       llni.h \
+       native.cpp \
+       native.hpp
 
 libnative_la_LIBADD = \
-       vm/libnativevm.la
+       vm/libnativevm.la \
+       $(JVMTI_LIB)
 
 
 ## Local variables: