PatchSet 7012
Date: 2005/12/18 22:40:31
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Build fix for using prebuilt glubj.zip
2005-12-18 Jari Korva <[EMAIL PROTECTED]>
* libraries/javalib/Makefile.am.in:
Properly clean up after ourselves when using a prebuilt glibj.zip.
Members:
ChangeLog:1.4532->1.4533
libraries/javalib/Makefile.am:1.413->1.414
libraries/javalib/Makefile.am.in:1.58->1.59
libraries/javalib/Makefile.in:1.510->1.511
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4532 kaffe/ChangeLog:1.4533
--- kaffe/ChangeLog:1.4532 Sun Dec 18 17:54:28 2005
+++ kaffe/ChangeLog Sun Dec 18 22:40:31 2005
@@ -1,3 +1,8 @@
+2005-12-18 Jari Korva <[EMAIL PROTECTED]>
+
+ * libraries/javalib/Makefile.am.in:
+ Properly clean up after ourselves when using a prebuilt glibj.zip.
+
2005-12-18 Guilhem Lavaux <[EMAIL PROTECTED]>
* kaffe/kaffevm/gcFuncs.c
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.413
kaffe/libraries/javalib/Makefile.am:1.414
--- kaffe/libraries/javalib/Makefile.am:1.413 Sun Dec 18 17:36:17 2005
+++ kaffe/libraries/javalib/Makefile.am Sun Dec 18 22:40:34 2005
@@ -30,9 +30,12 @@
glibj.zip: stamp-glibj
else
-stamp-libj:
+stamp-glibj:
@touch stamp-glibj
endif
+
+clean-local:
+ rm -rf stamp-glibj glibj.zip
SUBDIRS= . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT)
$(MAYBE_GMP_JAVA_MATH)
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.58
kaffe/libraries/javalib/Makefile.am.in:1.59
--- kaffe/libraries/javalib/Makefile.am.in:1.58 Sun Dec 18 17:36:19 2005
+++ kaffe/libraries/javalib/Makefile.am.in Sun Dec 18 22:40:35 2005
@@ -30,9 +30,12 @@
glibj.zip: stamp-glibj
else
-stamp-libj:
+stamp-glibj:
@touch stamp-glibj
endif
+
+clean-local:
+ rm -rf stamp-glibj glibj.zip
SUBDIRS= . external/classpath $(MAYBE_PEERLESS_KAFFE_AWT)
$(MAYBE_GMP_JAVA_MATH)
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.510
kaffe/libraries/javalib/Makefile.in:1.511
--- kaffe/libraries/javalib/Makefile.in:1.510 Sun Dec 18 17:36:20 2005
+++ kaffe/libraries/javalib/Makefile.in Sun Dec 18 22:40:35 2005
@@ -1972,7 +1972,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -2020,11 +2020,11 @@
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec \
+ clean clean-generic clean-libtool clean-local clean-recursive \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-libtool distclean-recursive distclean-tags distdir \
+ dvi dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-data-local install-exec \
install-exec-am install-info install-info-am \
install-jrelibDATA install-man install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
@@ -2042,8 +2042,11 @@
@USE_PRECOMPILED_RT_JAR_TRUE@ @touch stamp-glibj
@[EMAIL PROTECTED]: stamp-glibj
[EMAIL PROTECTED]@stamp-libj:
[EMAIL PROTECTED]@stamp-glibj:
@USE_PRECOMPILED_RT_JAR_FALSE@ @touch stamp-glibj
+
+clean-local:
+ rm -rf stamp-glibj glibj.zip
export JAVA_COMPILER
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
