* src/native/Makefile.am: Accidentally moved the library into if

ENABLE_STATICVM.
* src/native/include/Makefile.am: Enable accidentally removed
dependencies.

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index aaf310c4dc396565bc80b26ab65c5521342b7ec1..3c28a99ab004da5be8345b465c700120403756a5 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4419 2006-02-03 22:57:32Z twisti $
+## $Id: Makefile.am 4424 2006-02-04 00:33:39Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -49,6 +49,15 @@ if ENABLE_STATICVM
 SUBDIRS += tools
 CLEANFILES += nativetable.inc
 
+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
+       $(top_builddir)/src/native/tools/gennativetable -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc
+endif
+
 $(srcdir)/native.c: nativetable.inc
 
 noinst_LTLIBRARIES = libnative.la
@@ -63,16 +72,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

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index a0c92b91cc154461db951f7a7019f2e0893458a8..db8fd4bd177773e565af643cf54412ba69850d2b 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4419 2006-02-03 22:57:32Z twisti $
+## $Id: Makefile.am 4424 2006-02-04 00:33:39Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -143,8 +143,7 @@ $(NO_GEN_HEADER_FILES):
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
 
-#$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
-$(DO_HEADER_FILES):
+$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
        @class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class