* configure.ac (static-classpath): Removed.

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

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index e667598a2e8174a12bc79c36398aa60c96d16173..8cb17b562df183739d54a40fd245c2e5e35fdb52 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,51 +19,43 @@
 ##
 ## 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 1740 2004-12-08 16:38:25Z 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@
+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 = tools include vm
+LIBS =
 
-# include NO_REGEN_CLASSES, CLASSES and AWT_CLASSES
-include $(srcdir)/classes.am
+SUBDIRS = \
+       include \
+       vm
+
+if ENABLE_JVMTI
+SUBDIRS += jvmti
+JVMTI_LIB = jvmti/libjvmti.la
+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) \
+       llni.c \
+       llni.h \
        native.c \
-       native.h \
-       nativecalls.inc
+       native.h
 
 libnative_la_LIBADD = \
-       vm/libnativevm.la
-
-native.c: nativetable.inc nativecalls.inc
-
-if USE_GTK_PEER
-AWT_HEADERS_TOUCH_FILE = $(srcdir)/include/awtheaders-generated
-endif
-
-nativetable.inc: $(top_srcdir)/src/classpath/lib/bootstrap.zip $(srcdir)/tools/gennativetable $(top_srcdir)/config.h $(srcdir)/include/headers-generated $(AWT_HEADERS_TOUCH_FILE) $(srcdir)/classes.am
-       CLASSPATH=$(top_srcdir)/src/classpath/lib/bootstrap.zip \
-       $(top_srcdir)/src/native/tools/gennativetable \
-       $(NO_REGEN_CLASSES) \
-       $(CLASSES) \
-       $(AWT_CLASSES) \
-       > nativetable.inc
+       vm/libnativevm.la \
+       $(JVMTI_LIB)
 
 
 ## Local variables: