[m-dev.] diff: use `clean_local' instead of `clean' in Mmakefiles

Fergus Henderson fjh at cs.mu.OZ.AU
Thu Sep 16 14:41:11 AEST 1999
Previous message: [m-dev.] trivial diff: mention goal_paths.m in notes/compiler_design.html
Next message: [m-dev.] diff: fix problem with boehm_gc, -DLINUX_THREADS, and glibc 2.1
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Estimated hours taken: 0.75

Mmakefile:
*/Mmakefile:
*/*/Mmakefile:
*/*/*/Mmakefile:
	Use `clean_local' instead of `clean' and `realclean_local' instead
	of `realclean' where appropriate.  This is necessary now that
	`realclean' does not depend on `clean'.

Workspace: /d-drive/home/hg/fjh/mercury
Index: extras/references/samples/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/references/samples/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- extras/references/samples/Mmakefile	1999/07/20 03:39:23	1.2
+++ extras/references/samples/Mmakefile	1999/09/16 04:33:09
@@ -56,8 +56,8 @@
 .PHONY: cs
 cs: $(CS)
 
-.PHONY: clean
-clean:
+.PHONY: clean_local
+clean_local:
 	rm -f *.out *.res
 
 #-----------------------------------------------------------------------------#
Index: extras/references/tests/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/references/tests/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- extras/references/tests/Mmakefile	1999/07/20 03:39:23	1.2
+++ extras/references/tests/Mmakefile	1999/09/16 04:33:17
@@ -56,8 +56,8 @@
 .PHONY: cs
 cs: $(CS)
 
-.PHONY: clean
-clean:
+.PHONY: clean_local
+clean_local:
 	rm -f *.out *.res
 
 #-----------------------------------------------------------------------------#
Index: extras/trailed_update/samples/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/samples/Mmakefile,v
retrieving revision 1.10
diff -u -r1.10 Mmakefile
--- extras/trailed_update/samples/Mmakefile	1999/07/20 03:39:24	1.10
+++ extras/trailed_update/samples/Mmakefile	1999/09/16 04:33:39
@@ -70,8 +70,8 @@
 .PHONY: cs
 cs: $(CS)
 
-.PHONY: clean
-clean:
+.PHONY: clean_local
+clean_local:
 	rm -f *.out *.res
 
 #-----------------------------------------------------------------------------#
Index: extras/trailed_update/tests/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/tests/Mmakefile,v
retrieving revision 1.3
diff -u -r1.3 Mmakefile
--- extras/trailed_update/tests/Mmakefile	1999/07/20 03:39:24	1.3
+++ extras/trailed_update/tests/Mmakefile	1999/09/16 04:33:51
@@ -60,8 +60,8 @@
 .PHONY: cs
 cs: $(CS)
 
-.PHONY: clean
-clean:
+.PHONY: clean_local
+clean_local:
 	rm -f *.out *.res
 
 #-----------------------------------------------------------------------------#
Index: samples/c_interface/c_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/c_calls_mercury/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- samples/c_interface/c_calls_mercury/Mmakefile	1997/09/10 11:00:54	1.2
+++ samples/c_interface/c_calls_mercury/Mmakefile	1999/09/16 04:34:01
@@ -27,7 +27,7 @@
 mercury_lib.h: mercury_lib.o
 
 # make sure that `mmake clean' removes c_main.o
-clean:
+clean_local:
 	rm -f c_main.o mercury_lib.h
 
 #-----------------------------------------------------------------------------#
Index: samples/c_interface/cplusplus_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/cplusplus_calls_mercury/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- samples/c_interface/cplusplus_calls_mercury/Mmakefile	1997/09/10 11:00:58	1.2
+++ samples/c_interface/cplusplus_calls_mercury/Mmakefile	1999/09/16 04:34:10
@@ -51,7 +51,7 @@
 mercury_lib.h: mercury_lib.o
 
 # make sure that `mmake clean' removes cpp_main.o and mercury_lib.h
-clean:
+clean_local:
 	rm -f cpp_main.o mercury_lib.h
 
 #-----------------------------------------------------------------------------#
Index: samples/c_interface/mercury_calls_c/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/mercury_calls_c/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- samples/c_interface/mercury_calls_c/Mmakefile	1997/09/10 11:01:02	1.2
+++ samples/c_interface/mercury_calls_c/Mmakefile	1999/09/16 04:34:17
@@ -14,5 +14,5 @@
 mercury_main: c_main.o
 
 # make sure that `mmake clean' removes c_main.o
-clean:
+clean_local:
 	rm -f c_main.o
Index: samples/c_interface/mercury_calls_cplusplus/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/mercury_calls_cplusplus/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- samples/c_interface/mercury_calls_cplusplus/Mmakefile	1997/09/10 11:01:05	1.2
+++ samples/c_interface/mercury_calls_cplusplus/Mmakefile	1999/09/16 04:34:23
@@ -35,7 +35,7 @@
 mercury_main: cpp_main.o
 
 # make sure that `mmake clean' removes cpp_main.o
-clean:
+clean_local:
 	rm -f cpp_main.o
 
 #-----------------------------------------------------------------------------#
Index: samples/c_interface/mercury_calls_fortran/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/mercury_calls_fortran/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- samples/c_interface/mercury_calls_fortran/Mmakefile	1998/05/19 10:13:57	1.1
+++ samples/c_interface/mercury_calls_fortran/Mmakefile	1999/09/16 04:34:33
@@ -27,5 +27,5 @@
 mercury_main: fortran_main.o
 
 # make sure that `mmake clean' removes fortran_main.o
-clean:
+clean_local:
 	rm -f fortran_main.o
Index: samples/c_interface/simpler_c_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/simpler_c_calls_mercury/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- samples/c_interface/simpler_c_calls_mercury/Mmakefile	1997/09/10 11:01:07	1.2
+++ samples/c_interface/simpler_c_calls_mercury/Mmakefile	1999/09/16 04:34:41
@@ -33,10 +33,10 @@
 mercury_lib.h: mercury_lib.o
 
 # make sure that `mmake clean' removes c_main.o
-clean:
+clean_local:
 	rm -f c_main.o mercury_lib.h
 
-realclean:
+realclean_local:
 	rm -f c_main
 
 #-----------------------------------------------------------------------------#
Index: samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile,v
retrieving revision 1.2
diff -u -r1.2 Mmakefile
--- samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile	1997/09/10 11:01:10	1.2
+++ samples/c_interface/simpler_cplusplus_calls_mercury/Mmakefile	1999/09/16 04:34:53
@@ -52,10 +52,10 @@
 mercury_lib.h: mercury_lib.o
 
 # make sure that `mmake clean' removes c_main.o
-clean:
+clean_local:
 	rm -f cpp_main.o mercury_lib.h
 
-realclean:
+realclean_local:
 	rm -f cpp_main
 
 #-----------------------------------------------------------------------------#
Index: compiler/notes/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/notes/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- compiler/notes/Mmakefile	1998/09/04 06:53:02	1.7
+++ compiler/notes/Mmakefile	1999/09/16 04:26:43
@@ -46,7 +46,7 @@
 	[ -d $(INSTALL_WEB_SUBDIR) ] || mkdir -p $(INSTALL_WEB_SUBDIR)
 	cp $(DOCS_ALL) $(INSTALL_WEB_SUBDIR)
 
-clean:
+clean_local:
 	rm -f $(DOCS_TEXT)
 
 #-----------------------------------------------------------------------------#
Index: extras/aditi/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/aditi/Mmakefile,v
retrieving revision 1.1
diff -u -r1.1 Mmakefile
--- extras/aditi/Mmakefile	1998/12/07 01:32:38	1.1
+++ extras/aditi/Mmakefile	1999/09/16 04:26:43
@@ -30,8 +30,7 @@
 .PHONY: all
 all: aditi.o
 
-.PHONY: clean
-clean:
+clean_local:
 	rm -f *.out *.res
 
 #-----------------------------------------------------------------------------#
Index: bindist/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bindist/Mmakefile,v
retrieving revision 1.21
diff -u -r1.21 Mmakefile
--- bindist/Mmakefile	1999/07/29 04:26:53	1.21
+++ bindist/Mmakefile	1999/09/16 04:26:43
@@ -118,7 +118,7 @@
 
 #-----------------------------------------------------------------------------#
 
-realclean:
+realclean_local:
 	rm -f bindist.configure bindist.build_vars
 
 #-----------------------------------------------------------------------------#
Index: boehm_gc/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- boehm_gc/Mmakefile	1999/03/15 00:39:19	1.7
+++ boehm_gc/Mmakefile	1999/09/16 04:26:43
@@ -37,7 +37,7 @@
 .PHONY: force
 force:
 
-clean:
+clean_local:
 	MAKEFLAGS=""; export MAKEFLAGS; \
 	$(MAKE) $(MMAKEFLAGS) clean
 	rm -f libgc.a libgc.so
Index: browser/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/Mmakefile,v
retrieving revision 1.5
diff -u -r1.5 Mmakefile
--- browser/Mmakefile	1999/06/01 08:15:53	1.5
+++ browser/Mmakefile	1999/09/16 04:26:43
@@ -156,7 +156,7 @@
 
 #-----------------------------------------------------------------------------#
 
-realclean:
+realclean_local:
 	rm -f lib$(BROWSER_LIB_NAME).a lib$(BROWSER_LIB_NAME).so \
 		$(BROWSER_LIB_NAME).init
 	rm -f tags
Index: bytecode/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bytecode/Mmakefile,v
retrieving revision 1.12
diff -u -r1.12 Mmakefile
--- bytecode/Mmakefile	1999/04/08 12:57:56	1.12
+++ bytecode/Mmakefile	1999/09/16 04:26:43
@@ -107,10 +107,10 @@
 
 #-----------------------------------------------------------------------------#
 
-clean: 
+clean_local: 
 	rm -f *.o *.pic_o
 
-realclean: clean
+realclean_local:
 	-$(RM) mbi mdis depend.mk* libmbi.a libmbi.so \
 		mdb mdb.c mdb.d mdb_init.c
 
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.22
diff -u -r1.22 Mmakefile
--- compiler/Mmakefile	1999/08/26 18:45:39	1.22
+++ compiler/Mmakefile	1999/09/16 04:26:43
@@ -177,14 +177,14 @@
 
 #-----------------------------------------------------------------------------#
 
-clean:
+clean_local:
 	for file in *.pp; do \
 		if [ "$$file" != "*.pp" ]; then \
 			rm -f `basename $$file .pp`.m; \
 		fi; \
 	done
 
-realclean:
+realclean_local:
 	rm -f tags mercury_compile.stats $(PP_DATE_FILES)
 
 #-----------------------------------------------------------------------------#
Index: doc/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/Mmakefile,v
retrieving revision 1.18
diff -u -r1.18 Mmakefile
--- doc/Mmakefile	1999/07/20 21:29:53	1.18
+++ doc/Mmakefile	1999/09/16 04:26:43
@@ -274,7 +274,7 @@
 
 #-----------------------------------------------------------------------------#
 
-clean: distclean clean_texi
+clean_local: distclean clean_texi
 
 .PHONY: distclean
 distclean:
@@ -284,7 +284,7 @@
 clean_texi:
 	rm -f library-menu.texi library-chapters.texi
 
-realclean: realclean_texi realclean_manpages
+realclean_local: realclean_texi realclean_manpages
 
 .PHONY: realclean_texi
 realclean_texi:
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.40
diff -u -r1.40 Mmakefile
--- library/Mmakefile	1999/06/20 09:33:28	1.40
+++ library/Mmakefile	1999/09/16 04:26:43
@@ -214,7 +214,7 @@
 
 #-----------------------------------------------------------------------------#
 
-realclean:
+realclean_local:
 	rm -f lib$(STD_LIB_NAME).a lib$(STD_LIB_NAME).so $(STD_LIB_NAME).init
 	rm -f tags
 
Index: profiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/profiler/Mmakefile,v
retrieving revision 1.12
diff -u -r1.12 Mmakefile
--- profiler/Mmakefile	1999/07/20 21:29:59	1.12
+++ profiler/Mmakefile	1999/09/16 04:26:43
@@ -100,7 +100,7 @@
 
 #-----------------------------------------------------------------------------#
 
-realclean:
+realclean_local:
 	rm -f tags
 
 #-----------------------------------------------------------------------------#
Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.48
diff -u -r1.48 Mmakefile
--- runtime/Mmakefile	1999/06/01 08:16:09	1.48
+++ runtime/Mmakefile	1999/09/16 04:26:43
@@ -305,7 +305,7 @@
 
 #-----------------------------------------------------------------------------#
 
-clean: clean_o clean_check
+clean_local: clean_o clean_check
 
 .PHONY: clean_o
 clean_o:
@@ -315,7 +315,7 @@
 clean_check:
 	rm -f $(HDR_CHECK_OBJS) $(HDR_CHECK_CS) $(HDR_CHECK_MACROS)
 
-realclean:
+realclean_local:
 	rm -f lib$(RT_LIB_NAME).a lib$(RT_LIB_NAME).so $(RT_LIB_NAME).init
 	rm -f mercury_conf.h mercury_conf.h.date
 
Index: scripts/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmakefile,v
retrieving revision 1.16
diff -u -r1.16 Mmakefile
--- scripts/Mmakefile	1999/07/29 04:27:20	1.16
+++ scripts/Mmakefile	1999/09/16 04:26:43
@@ -90,7 +90,7 @@
 
 #-----------------------------------------------------------------------------#
 
-realclean: clean_scripts
+realclean_local: clean_scripts
 
 .PHONY: clean_scripts
 clean_scripts:
Index: trace/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/Mmakefile,v
retrieving revision 1.11
diff -u -r1.11 Mmakefile
--- trace/Mmakefile	1999/06/01 08:16:11	1.11
+++ trace/Mmakefile	1999/09/16 04:26:43
@@ -172,13 +172,13 @@
 
 #-----------------------------------------------------------------------------#
 
-clean: clean_o
+clean_local: clean_o
 
 .PHONY: clean_o
 clean_o:
 	rm -f $(OBJS) $(PIC_OBJS) 
 
-realclean:
+realclean_local:
 	rm -f lib$(TRACE_LIB_NAME).a lib$(TRACE_LIB_NAME).so
 
 #-----------------------------------------------------------------------------#
Index: util/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/util/Mmakefile,v
retrieving revision 1.6
diff -u -r1.6 Mmakefile
--- util/Mmakefile	1999/07/20 21:30:02	1.6
+++ util/Mmakefile	1999/09/16 04:26:43
@@ -43,7 +43,7 @@
 
 #-----------------------------------------------------------------------------#
 
-realclean:
+realclean_local:
 	-rm -f $(PROGS)
 
 #-----------------------------------------------------------------------------#
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.40
diff -u -r1.40 Mmakefile
--- Mmakefile	1999/07/20 21:29:35	1.40
+++ Mmakefile	1999/09/16 04:26:43
@@ -453,7 +453,10 @@
 		(cd $$dir; $(SUBDIR_MMAKE) clean) \
 	done
 
-realclean: realclean_subdirs realclean_config
+realclean: realclean_subdirs realclean_local
+
+.PHONY: realclean_local
+realclean_local: realclean_config
 
 .PHONY: realclean_subdirs
 realclean_subdirs: clean_subdirs

-- 
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.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
Previous message: [m-dev.] trivial diff: mention goal_paths.m in notes/compiler_design.html
Next message: [m-dev.] diff: fix problem with boehm_gc, -DLINUX_THREADS, and glibc 2.1
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the developers mailing list