trivial diff: rules for `mmake clean'

Fergus Henderson fjh at cs.mu.OZ.AU
Thu Apr 9 13:57:05 AEST 1998


Makefile:
tests/valid/Mmakefile:
tests/invalid/Mmakefile:
	Fix some code rot in the rules for `make clean';
	amoung other things, change them so that they
	handle `--use-subdirs' correctly.

cvs diff  Makefile tests/invalid/Mmakefile tests/valid/Mmakefile
Index: Makefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	1997/11/20 01:58:28	1.8
+++ Makefile	1998/04/02 13:44:56
@@ -36,15 +36,19 @@
 .PHONY: clean
 clean:
 	-rm -f */*.o */*.pic_o */*.a */*.so */*.no */*.ql */*.pl
+	-rm -rf */Mercury/os */Mercury/pic_os */Mercury/libs
+	-rm -rf */Mercury/qls */Mercury/nos
 	-rm -f compiler/mercury_compile profiler/mercury_profile 
 	-rm -f library/library.nu* library/library.sicstus*
-	-rm -f library/sicstus_compile util/mdemangle util/mkinit
+	-rm -f library/sicstus_compile library/sicstus_saved_state
+	-rm -f util/mdemangle util/mkinit
 	cd boehm_gc; $(MMAKE_SUBDIR) clean
 
 .PHONY: distclean
 distclean: clean
 	cd scripts; for file in *.in; do rm -f `basename $file .in`; done
-	-rm -f Mmake.common runtime/mercury_conf.h bindist/bindist.build_vars
+	-rm -f Mmake.common runtime/mercury_conf.h
+	-rm -f boehm_gc/mercury_boehm_gc_conf.h bindist/bindist.build_vars
 	-rm -f config.cache config.status config.log
 
 .PHONY: maintainer-clean
Index: tests/invalid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/invalid/Mmakefile,v
retrieving revision 1.16
diff -u -r1.16 Mmakefile
--- Mmakefile	1998/03/18 17:30:56	1.16
+++ Mmakefile	1998/04/02 13:52:05
@@ -90,6 +90,6 @@
 depend:	test_nested.depend
 
 clean:
-	rm -f *.c *.o *.err *.err2 *.d *.err_res
+	rm -f *.err *.err_res
 
 #-----------------------------------------------------------------------------#
Index: tests/valid/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/valid/Mmakefile,v
retrieving revision 1.14
diff -u -r1.14 Mmakefile
--- Mmakefile	1998/03/30 13:25:04	1.14
+++ Mmakefile	1998/04/02 13:53:37
@@ -165,6 +165,6 @@
 	@echo $(OBJS)
 
 clean:
-	rm -f *.c *.o *.err *.d *.h
+	rm -f *.err *.h
 
 #-----------------------------------------------------------------------------#

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.



More information about the developers mailing list