[m-rev.] diff: don't delete mercury directories

Peter Wang novalazy at gmail.com
Mon Jun 22 13:00:23 AEST 2009


Branches: main

browser/Mmakefile:
compiler/Mmakefile:
deep_profiler/Mmakefile:
library/Mmakefile:
profiler/Mmakefile:
slice/Mmakefile:
ssdb/Mmakefile:
        Don't delete mercury directories as the Java backend no longer uses
        them.

diff --git a/browser/Mmakefile b/browser/Mmakefile
index 9949aa5..624e022 100644
--- a/browser/Mmakefile
+++ b/browser/Mmakefile
@@ -262,7 +262,6 @@ $(os_subdir)mdb.pic_o \

 realclean_local:
 	rm -f Mercury.modules tags MDB_FLAGS MDB_FLAGS.date
-	rm -rf mercury

 #-----------------------------------------------------------------------------#

diff --git a/compiler/Mmakefile b/compiler/Mmakefile
index 65b6cdb..e699a71 100644
--- a/compiler/Mmakefile
+++ b/compiler/Mmakefile
@@ -326,7 +326,6 @@ clean_local:
 realclean_local:
 	rm -f tags $(MC_PROG).stats Mercury.modules \
 		COMP_FLAGS COMP_FLAGS.date mercury_compile$(EXT_FOR_EXE)
-	rm -rf mercury

 #-----------------------------------------------------------------------------#
 #-----------------------------------------------------------------------------#
diff --git a/deep_profiler/Mmakefile b/deep_profiler/Mmakefile
index e7163ed..d179b86 100644
--- a/deep_profiler/Mmakefile
+++ b/deep_profiler/Mmakefile
@@ -185,7 +185,6 @@ cs: $(mdprof_procrep.cs) $(cs_subdir)mdprof_procrep_init.c
 realclean_local:
 	rm -f .deep_tags tags DEEP_FLAGS DEEP_FLAGS.date \
 		$(MDBCOMP_MODULES) mdbcomp.*.err
-	rm -rf mercury

 #-----------------------------------------------------------------------------#

diff --git a/library/Mmakefile b/library/Mmakefile
index 15d5c83..a8fc2b8 100644
--- a/library/Mmakefile
+++ b/library/Mmakefile
@@ -449,7 +449,7 @@ realclean_local:
 	rm -f $($(STD_LIB_NAME).mods:%=%.h)
 	rm -f tags LIB_FLAGS LIB_FLAGS.date
 	rm -f runtime
-	rm -rf mercury
+	rm -rf jmercury
 	rm -f mr_int.class mr_float.class mr_char.class
 	rm -f mr_int\$$*.class mr_float\$$*.class mr_char\$$*.class
 	rm -f $(JARS) $(NATIVE_SO)
diff --git a/profiler/Mmakefile b/profiler/Mmakefile
index a58d4f9..3e4232c 100644
--- a/profiler/Mmakefile
+++ b/profiler/Mmakefile
@@ -84,7 +84,6 @@ ils: $(mercury_profile.ils)

 realclean_local:
 	rm -f tags PROF_FLAGS PROF_FLAGS.date
-	rm -rf mercury

 #-----------------------------------------------------------------------------#

diff --git a/slice/Mmakefile b/slice/Mmakefile
index db4c93a..51a492a 100644
--- a/slice/Mmakefile
+++ b/slice/Mmakefile
@@ -165,7 +165,6 @@ ils:	$(mslice.ils) $(mdice.ils) $(mtc_union.ils)
$(mcov.ils) $(mtc_diff.ils)
 realclean_local:
 	rm -f tags SLICE_FLAGS SLICE_FLAGS.date \
 		$(MDBCOMP_MODULES) mdbcomp.*.err
-	rm -rf mercury

 #-----------------------------------------------------------------------------#

diff --git a/ssdb/Mmakefile b/ssdb/Mmakefile
index 94e0c55..5610b6a 100644
--- a/ssdb/Mmakefile
+++ b/ssdb/Mmakefile
@@ -262,7 +262,6 @@ $(os_subdir)mdb.pic_o \

 realclean_local:
 	rm -f Mercury.modules tags SSDB_FLAGS SSDB_FLAGS.date
-	rm -rf mercury

 #-----------------------------------------------------------------------------#
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list