[m-rev.] diff: clean up boehm_gc directory properly

[Julien Fischer]

(I think this is the cause of the problems with Cygwin reported on 
mercury-{users,developers}, although my attempts to reproduce that
behaviour on a Windows machine here have thus far failed.)

Branches: main, 10.04

Clean up the Boehm GC directory properly before building the source distribution.

boehm_gc/Mmakefile:
 	The clean_local target should also clean up generated files in the
 	libatomic_ops directory as opposed to just in the libatomic_ops-1.2
 	directory.

 	On Mac OS X, we should get rid of .dylib files.

Julien.

Index: boehm_gc/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/boehm_gc/Mmakefile,v
retrieving revision 1.38
diff -u -r1.38 Mmakefile
--- boehm_gc/Mmakefile	26 Feb 2010 13:16:44 -0000	1.38
+++ boehm_gc/Mmakefile	12 Oct 2010 05:05:21 -0000
@@ -77,11 +77,17 @@
  	rm -rf Release/ Debug/
  	rm -f *.obj gc.lib libgc.lib libpar_gc.lib libpar_gc.dll libgc_debug.lib
  	cd libatomic_ops-1.2 && $(MAKE) clean
+	cd libatomic_ops && $(MAKE) clean
  	rm -f libatomic_ops-1.2/Makefile libatomic_ops-1.2/tests/Makefile
  	rm -f libatomic_ops-1.2/src/Makefile
  	rm -f libatomic_ops-1.2/src/atomic_ops/Makefile
  	rm -f libatomic_ops-1.2/src/config.h
  	rm -f libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile
+	rm -f libatomic_ops/Makefile libatomic_ops/tests/Makefile
+	rm -f libatomic_ops/src/Makefile
+	rm -f libatomic_ops/src/atomic_ops/Makefile
+	rm -f libatomic_ops/src/config.h
+	rm -f libatomic_ops/src/atomic_ops/sysdeps/Makefile
  	rm -rf libatomic_ops-install
  else

@@ -96,12 +102,18 @@
  	MAKEFLAGS=""; export MAKEFLAGS; \
  	$(MAKE) $(BOEHMGC_MAKEFILE) $(MMAKEFLAGS) clean
  	-cd libatomic_ops-1.2 && $(MAKE) $(MMAKEFLAGS) clean
-	rm -f libgc.$A libgc.so libpar_gc.$A libpar_gc.dll
+	-cd libatomic_ops && $(MAKE) $(MMAKEFLAGS) clean
+	rm -f libgc.$A libgc.so libgc.dylib libpar_gc.$A libpar_gc.dll
  	rm -f libatomic_ops-1.2/Makefile libatomic_ops-1.2/tests/Makefile
  	rm -f libatomic_ops-1.2/src/Makefile
  	rm -f libatomic_ops-1.2/src/atomic_ops/Makefile
  	rm -f libatomic_ops-1.2/src/config.h
  	rm -f libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile
+	rm -f libatomic_ops/Makefile libatomic_ops/tests/Makefile
+	rm -f libatomic_ops/src/Makefile
+	rm -f libatomic_ops/src/atomic_ops/Makefile
+	rm -f libatomic_ops/src/config.h
+	rm -f libatomic_ops/src/atomic_ops/sysdeps/Makefile
  	rm -rf libatomic_ops-install
  	rm -f Makefile


--------------------------------------------------------------------------
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
--------------------------------------------------------------------------