merge fixes

Author: danpoe

regression/acceleration/Makefile

@@ -14,5 +14,5 @@ show:
 	done;
 
 clean:
-	rm -f tests.log
-	rm -f */main.out
+	$(RM) tests.log
+	$(RM) */main.out

regression/ansi-c/Makefile

@@ -18,3 +18,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/array-refinement-with-incr/Makefile

@@ -14,3 +14,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/array-refinement/Makefile

@@ -14,3 +14,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cbmc-concurrency/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cbmc-cover/Makefile

@@ -18,3 +18,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cbmc-cpp/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cbmc-from-CVS/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cbmc-incr-oneloop/Makefile

@@ -14,5 +14,5 @@ show:
 	done;
 
 clean:
-	@rm -f *.log
-	@(for dir in *; do rm -f $$dir/*.out; done;)
+	@$(RM) *.log
+	@(for dir in *; do $(RM) $$dir/*.out; done;)

regression/cbmc-incr/Makefile

@@ -17,5 +17,5 @@ show:
 	done;
 
 clean:
-	@rm -f *.log
-	@(for dir in *; do rm -f $$dir/*.out; done;)
+	@$(RM) *.log
+	@(for dir in *; do $(RM) $$dir/*.out; done;)

regression/cbmc-java/Makefile

@@ -18,3 +18,8 @@ show:
 			vim -o "$$dir/*.java" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cbmc-with-incr/Makefile

@@ -14,5 +14,5 @@ show:
 	done;
 
 clean:
-	@rm -f *.log
-	@for dir in *; do rm -f $$dir/*.out; done;
+	@$(RM) *.log
+	@for dir in *; do $(RM) $$dir/*.out; done;

regression/cbmc/Makefile

@@ -18,3 +18,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cpp-from-CVS/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/main.c" "$$dir/main.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cpp-linter/Makefile

@@ -18,3 +18,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/cpp/Makefile

@@ -18,3 +18,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/fault-localization/Makefile

@@ -18,3 +18,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/goto-analyzer/Makefile

@@ -20,7 +20,6 @@ show:
 	done;
 
 clean:
-	find . -name *.*~ | xargs rm -f
-	find . -name *.out | xargs rm -f
-	find . -name *.goto | xargs rm -f
-	rm -f tests.log	
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/goto-instrument-wmm-core/Makefile

@@ -21,7 +21,7 @@ tests.log: ../test.pl
 clean:
 	@for dir in *; do \
                 if [ -d "$$dir" ]; then \
-                        rm $$dir/*.txt $$dir/*.dot $$dir/*.gb $$dir/*.out; \
+                        $(RM) $$dir/*.txt $$dir/*.dot $$dir/*.gb $$dir/*.out; \
                 fi; \
         done;
 

regression/goto-instrument/Makefile

@@ -22,10 +22,10 @@ show:
 
 clean:
 	@for dir in *; do \
-		rm -f tests.log; \
+		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
-			rm -f *.out *.gb; \
+			$(RM) *.out *.gb; \
 			cd ..; \
 		fi \
 	done

regression/k-induction/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/symex-infeasibility/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/symex/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/*.c" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/taint/Makefile

@@ -12,3 +12,8 @@ show:
 			vim -o "$$dir/*.java" "$$dir/*.out"; \
 		fi; \
 	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log

regression/test-script/Makefile

@@ -37,10 +37,10 @@ show:
 
 clean:
 	@for dir in *; do \
-		rm -f tests.log; \
+		$(RM) tests.log; \
 		if [ -d "$$dir" ]; then \
 			cd "$$dir"; \
-			rm -f *.out *.gb; \
+			$(RM) *.out *.gb; \
 			cd ..; \
 		fi \
 	done

src/solvers/miniBDD/Makefile

@@ -16,7 +16,7 @@ test_miniBDD: miniBDD.o test_miniBDD.o
 	g++ $(CPLUSFLAGS) miniBDD.o test_miniBDD.o -o test_miniBDD
 
 clean:
-	rm -f miniBDD.o test_miniBDD.o test_miniBDD
+	$(RM) miniBDD.o test_miniBDD.o test_miniBDD
 
 miniBDD.tgz: miniBDD.cpp miniBDD.inc miniBDD.h test_miniBDD.cpp Makefile
 	tar cvfz miniBDD.tgz miniBDD.cpp miniBDD.inc \