update distclean target

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14801 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
yallop · May 12, 2014 · d0368bc · d0368bc
1 parent f4654c8
commit d0368bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -850,7 +850,7 @@ distclean:
 	rm -f boot/ocamlrun boot/ocamlrun.exe boot/camlheader boot/ocamlyacc \
 	      boot/*.cm* boot/libcamlrun.a
 	rm -f config/Makefile config/m.h config/s.h
-	rm -f tools/*.bak tools/ocamlmklibconfig.ml
+	rm -f tools/*.bak
 	rm -f ocaml ocamlc
 	rm -f testsuite/_log
 

diff --git a/Makefile.nt b/Makefile.nt
@@ -727,7 +727,13 @@ depend: beforedepend
 alldepend:: depend
 
 distclean:
-	./build/distclean.sh
+	$(MAKE) clean
+	rm -f boot/ocamlrun boot/ocamlrun.exe boot/camlheader boot/ocamlyacc \
+	      boot/*.cm* boot/libcamlrun.a
+	rm -f config/Makefile config/m.h config/s.h
+	rm -f tools/*.bak
+	rm -f ocaml ocamlc
+	rm -f testsuite/_log
 
 .PHONY: all backup bootstrap checkstack clean
 .PHONY: partialclean beforedepend alldepend cleanboot coldstart

diff --git a/tools/ci-build b/tools/ci-build
@@ -108,7 +108,7 @@ esac
 
 cd "$workdir"
 
-$make -f Makefile$nt clean distclean || :
+$make -f Makefile$nt distclean || :
 
 if $docheckout; then
   svn update --accept theirs-full