PatchSet 6869
Date: 2005/08/25 00:51:21
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fix for Maven1
2005-08-24 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/Makefile.am.in:
(toolslib_DATA) Moved tools.jar over here to fix
ant and Maven warnings.
Members:
ChangeLog:1.4390->1.4391
libraries/javalib/Makefile.am:1.386->1.387
libraries/javalib/Makefile.am.in:1.46->1.47
libraries/javalib/Makefile.in:1.476->1.477
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4390 kaffe/ChangeLog:1.4391
--- kaffe/ChangeLog:1.4390 Wed Aug 24 02:23:09 2005
+++ kaffe/ChangeLog Thu Aug 25 00:51:21 2005
@@ -1,5 +1,11 @@
2005-08-24 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/Makefile.am.in:
+ (toolslib_DATA) Moved tools.jar over here to fix
+ ant and Maven warnings.
+
+2005-08-24 Dalibor Topic <[EMAIL PROTECTED]>
+
* Makefile.am: (KAFFELIBRARYPATH) Fixed them again
to work without having GNU findutils.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.386
kaffe/libraries/javalib/Makefile.am:1.387
--- kaffe/libraries/javalib/Makefile.am:1.386 Sun Aug 21 19:28:36 2005
+++ kaffe/libraries/javalib/Makefile.am Thu Aug 25 00:51:22 2005
@@ -45,9 +45,11 @@
installed_properties = \
logging.properties
+toolslib_DATA = \
+ tools.jar
+
jrelib_DATA = \
rt.jar \
- tools.jar \
$(installed_properties)
Klasses_jar_SRCS = \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.46
kaffe/libraries/javalib/Makefile.am.in:1.47
--- kaffe/libraries/javalib/Makefile.am.in:1.46 Sun Jul 17 16:40:09 2005
+++ kaffe/libraries/javalib/Makefile.am.in Thu Aug 25 00:51:23 2005
@@ -45,9 +45,11 @@
installed_properties = \
logging.properties
+toolslib_DATA = \
+ tools.jar
+
jrelib_DATA = \
rt.jar \
- tools.jar \
$(installed_properties)
Klasses_jar_SRCS = \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.476
kaffe/libraries/javalib/Makefile.in:1.477
--- kaffe/libraries/javalib/Makefile.in:1.476 Sun Aug 21 19:28:36 2005
+++ kaffe/libraries/javalib/Makefile.in Thu Aug 25 00:51:23 2005
@@ -103,9 +103,10 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(jrelibdir)"
+am__installdirs = "$(DESTDIR)$(jrelibdir)" "$(DESTDIR)$(toolslibdir)"
jrelibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(jrelib_DATA)
+toolslibDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(jrelib_DATA) $(toolslib_DATA)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = . awt-implementations gmp-math
@@ -405,9 +406,11 @@
installed_properties = \
logging.properties
+toolslib_DATA = \
+ tools.jar
+
jrelib_DATA = \
rt.jar \
- tools.jar \
$(installed_properties)
Klasses_jar_SRCS = \
@@ -6433,6 +6436,23 @@
echo " rm -f '$(DESTDIR)$(jrelibdir)/$$f'"; \
rm -f "$(DESTDIR)$(jrelibdir)/$$f"; \
done
+install-toolslibDATA: $(toolslib_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(toolslibdir)" || $(mkdir_p) "$(DESTDIR)$(toolslibdir)"
+ @list='$(toolslib_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(toolslibDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(toolslibdir)/$$f'"; \
+ $(toolslibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(toolslibdir)/$$f"; \
+ done
+
+uninstall-toolslibDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(toolslib_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(toolslibdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(toolslibdir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -6616,7 +6636,7 @@
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(jrelibdir)"; do \
+ for dir in "$(DESTDIR)$(jrelibdir)" "$(DESTDIR)$(toolslibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -6662,7 +6682,7 @@
info-am:
-install-data-am: install-jrelibDATA
+install-data-am: install-jrelibDATA install-toolslibDATA
install-exec-am:
@@ -6688,7 +6708,8 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-jrelibDATA
+uninstall-am: uninstall-info-am uninstall-jrelibDATA \
+ uninstall-toolslibDATA
uninstall-info: uninstall-info-recursive
@@ -6699,12 +6720,13 @@
dvi dvi-am html html-am info info-am install install-am \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-jrelibDATA install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am uninstall-info-am \
- uninstall-jrelibDATA
+ install-strip install-toolslibDATA installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am uninstall-jrelibDATA \
+ uninstall-toolslibDATA
dist-hook:
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
