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

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

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index d149d03ddec6fb29ede5457554859f775472808b..8cb17b562df183739d54a40fd245c2e5e35fdb52 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -21,10 +21,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
-##
-## $Id: Makefile.am 8297 2007-08-12 00:02:48Z michi $
 
-## 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
 
@@ -34,28 +31,11 @@ SUBDIRS = \
        include \
        vm
 
-CLEANFILES = \
-       nativetable.inc
-
 if ENABLE_JVMTI
 SUBDIRS += jvmti
 JVMTI_LIB = jvmti/libjvmti.la
 endif
 
-if WITH_STATIC_CLASSPATH
-SUBDIRS += tools
-
-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
 
 if ENABLE_JNI
@@ -68,6 +48,8 @@ endif
 
 libnative_la_SOURCES = \
        $(JNI_SOURCES) \
+       llni.c \
+       llni.h \
        native.c \
        native.h