* src/native/vm/gnu/gnu_classpath_VMSystemProperties.c (postInit):

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

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index aaf310c4dc396565bc80b26ab65c5521342b7ec1..d418096db3d894e17a300d2e7686a86779d27f8e 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,34 +28,50 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4419 2006-02-03 22:57:32Z twisti $
+## $Id: Makefile.am 6236 2006-12-26 23:21:41Z 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
+
+LIBS =
 
 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: $(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_JAVASE
+JNI_SOURCES = \
        jni.c \
-       jni.h \
+       jni.h
+endif
+
+libnative_la_SOURCES = \
+       $(JNI_SOURCES) \
        native.c \
        native.h
 
@@ -63,16 +79,6 @@ libnative_la_LIBADD = \
        vm/libnativevm.la \
        $(JVMTI_LIB)
 
-VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_STRING)
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
-
-CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
-
-#nativetable.inc: $(VM_ZIP) $(GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
-nativetable.inc:
-       $(top_builddir)/src/native/tools/gennativetable -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc
-endif
-
 
 ## Local variables:
 ## mode: Makefile