[kaffe] CVS kaffe (hkraemer): fixes for make clean

Kaffe CVS cvs-commits at kaffe.org
Thu Jul 8 07:31:06 PDT 2004


PatchSet 4912 
Date: 2004/07/08 14:10:47
Author: hkraemer
Branch: HEAD
Tag: (none) 
Log:
fixes for make clean

Members: 
	ChangeLog:1.2478->1.2479 
	Makefile.am:1.69->1.70 
	Makefile.in:1.163->1.164 
	tools/gjdoc/javalib/Makefile.am:1.3->1.4 
	tools/gjdoc/javalib/Makefile.in:1.12->1.13 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2478 kaffe/ChangeLog:1.2479
--- kaffe/ChangeLog:1.2478	Thu Jul  8 14:00:00 2004
+++ kaffe/ChangeLog	Thu Jul  8 14:10:47 2004
@@ -1,3 +1,15 @@
+2004-07-08  Helmer Kraemer  <hkraemer at freenet.de>
+
+	* Makefile.am (kaffe-build-order): new target invoking make in the
+	different directories
+	(clean-local): new target so make clean works again
+
+	* tools/gjdoc/javalib/Makefile.am (clean-hook): renamed to clean-local
+
+	* Makefile.in, tools/gjdoc/javalib/Makefile.in: regenerated
+
+	Reported by:  Fabien Renaud  <renaud at nentec.de>
+
 2004-07-08  Gwenole Beauchesne  <gbeauchesne at mandrakesoft.com>
 
 	* config/x86_64//linux/md.h (SIGNAL_ARGS, SIGNAL_CONTEXT_POINTER):
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.69 kaffe/Makefile.am:1.70
--- kaffe/Makefile.am:1.69	Sun Jul  4 17:51:30 2004
+++ kaffe/Makefile.am	Thu Jul  8 14:10:49 2004
@@ -205,42 +205,32 @@
 endif
 endif
 
-all-local:
+.PHONY: kaffe-build-order
+
+kaffe-build-order:
 	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir all || exit $$? ; \
+		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
 	done; \
-	$(MAKE) -C libraries/javalib all || exit $$? ; \
+	$(MAKE) -C libraries/javalib $(KAFFE_BUILD_TARGET) || exit $$? ; \
 	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir all || exit $$? ; \
-	done ; \
+		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
+	done ;
+
+all-local: KAFFE_BUILD_TARGET = all
+all-local: kaffe-build-order
 	$(MAKE) -C kaffe/kaffe final-executable
 
-install-exec-hook:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-exec || exit $$? ; \
-	done; \
-	$(MAKE) -C libraries/javalib install-exec || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-exec || exit $$? ; \
-	done 
+install-exec-hook: KAFFE_BUILD_TARGET = install-exec
+install-exec-hook: kaffe-build-order
 
-install-data-hook:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-data || exit $$? ; \
-	done; \
-	$(MAKE) -C libraries/javalib install-data || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-data || exit $$? ; \
-	done 
+install-data-hook: KAFFE_BUILD_TARGET = install-data
+install-data-hook: kaffe-build-order
 
-uninstall-hook:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir uninstall || exit $$? ; \
-	done; \
-	$(MAKE) -C libraries/javalib uninstall || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir uninstall || exit $$? ; \
-	done 
+uninstall-hook: KAFFE_BUILD_TARGET = uninstall
+uninstall-hook: kaffe-build-order
+
+clean-local: KAFFE_BUILD_TARGET = clean
+clean-local: kaffe-build-order
 
 check-local:
 	$(MAKE) -C test check
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.163 kaffe/Makefile.in:1.164
--- kaffe/Makefile.in:1.163	Wed Jul  7 19:34:13 2004
+++ kaffe/Makefile.in	Thu Jul  8 14:10:49 2004
@@ -843,7 +843,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 $(am__CONFIG_DISTCLEAN_FILES)
@@ -901,19 +901,19 @@
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
 	am--refresh check check-am check-local clean clean-generic \
-	clean-libtool clean-recursive ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-recursive distclean-tags \
-	distcleancheck distdir distuninstallcheck 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-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
+	clean-libtool clean-local clean-recursive ctags \
+	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-recursive \
+	distclean-tags distcleancheck distdir distuninstallcheck 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-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
 
 
 depend:
@@ -964,42 +964,32 @@
 docs-regen: docs-docbook-html
 	cp -f target/docs/docbook/*.html $(srcdir)/docs/html
 
-all-local:
+.PHONY: kaffe-build-order
+
+kaffe-build-order:
 	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir all || exit $$? ; \
+		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
 	done; \
-	$(MAKE) -C libraries/javalib all || exit $$? ; \
+	$(MAKE) -C libraries/javalib $(KAFFE_BUILD_TARGET) || exit $$? ; \
 	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir all || exit $$? ; \
-	done ; \
+		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
+	done ;
+
+all-local: KAFFE_BUILD_TARGET = all
+all-local: kaffe-build-order
 	$(MAKE) -C kaffe/kaffe final-executable
 
-install-exec-hook:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-exec || exit $$? ; \
-	done; \
-	$(MAKE) -C libraries/javalib install-exec || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-exec || exit $$? ; \
-	done 
+install-exec-hook: KAFFE_BUILD_TARGET = install-exec
+install-exec-hook: kaffe-build-order
 
-install-data-hook:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-data || exit $$? ; \
-	done; \
-	$(MAKE) -C libraries/javalib install-data || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir install-data || exit $$? ; \
-	done 
+install-data-hook: KAFFE_BUILD_TARGET = install-data
+install-data-hook: kaffe-build-order
 
-uninstall-hook:
-	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir uninstall || exit $$? ; \
-	done; \
-	$(MAKE) -C libraries/javalib uninstall || exit $$? ; \
-	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir uninstall || exit $$? ; \
-	done 
+uninstall-hook: KAFFE_BUILD_TARGET = uninstall
+uninstall-hook: kaffe-build-order
+
+clean-local: KAFFE_BUILD_TARGET = clean
+clean-local: kaffe-build-order
 
 check-local:
 	$(MAKE) -C test check
Index: kaffe/tools/gjdoc/javalib/Makefile.am
diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.3 kaffe/tools/gjdoc/javalib/Makefile.am:1.4
--- kaffe/tools/gjdoc/javalib/Makefile.am:1.3	Tue Jun  1 18:15:26 2004
+++ kaffe/tools/gjdoc/javalib/Makefile.am	Thu Jul  8 14:10:51 2004
@@ -153,7 +153,7 @@
 
 LIBDIR = lib
 
-clean-hook:
+clean-local:
 	rm -rf $(LIBDIR)
 
 .PHONY: new-classes
Index: kaffe/tools/gjdoc/javalib/Makefile.in
diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.12 kaffe/tools/gjdoc/javalib/Makefile.in:1.13
--- kaffe/tools/gjdoc/javalib/Makefile.in:1.12	Wed Jul  7 19:35:15 2004
+++ kaffe/tools/gjdoc/javalib/Makefile.in	Thu Jul  8 14:10:51 2004
@@ -593,7 +593,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -638,18 +638,18 @@
 uninstall-am: uninstall-info-am uninstall-toolslibDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir 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-man install-strip \
-	install-toolslibDATA installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-toolslibDATA
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir 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-man \
+	install-strip install-toolslibDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am uninstall-toolslibDATA
 
 
-clean-hook:
+clean-local:
 	rm -rf $(LIBDIR)
 
 .PHONY: new-classes




More information about the kaffe mailing list