/hg/icedtea-web: Fix new make targets not cleaning properly

[adomurad at icedtea.classpath.org]

changeset 4cd65d83965b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4cd65d83965b
author: Adam Domurad <adomurad at redhat.com>
date: Wed Nov 21 14:18:31 2012 -0500

	Fix new make targets not cleaning properly


diffstat:

 ChangeLog   |   4 ++++
 Makefile.am |  19 +++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r c7b7bd6fffb3 -r 4cd65d83965b ChangeLog
--- a/ChangeLog	Wed Nov 21 13:09:54 2012 -0500
+++ b/ChangeLog	Wed Nov 21 14:18:31 2012 -0500
@@ -1,3 +1,7 @@
+2012-11-21  Adam Domurad  <adomurad at redhat.com>
+
+	* Makefile.am: Fix new clean targets not cleaning properly
+
 2012-11-21  Adam Domurad  <adomurad at redhat.com>
 
 	Support for C++ unit testing with UnitTest++ for IcedTeaWeb.
diff -r c7b7bd6fffb3 -r 4cd65d83965b Makefile.am
--- a/Makefile.am	Wed Nov 21 13:09:54 2012 -0500
+++ b/Makefile.am	Wed Nov 21 14:18:31 2012 -0500
@@ -310,10 +310,11 @@
 	popd
 
 clean-unittest++:
-	rm $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o
-	rm $(CPP_UNITTEST_FRAMEWORK_LIB)
-	rmdir $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)
-	rmdir $(CPP_UNITTEST_DIR) &> /dev/null
+	rm -f $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o
+	rm -f $(CPP_UNITTEST_FRAMEWORK_LIB)
+	if [ -e $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) ] ; then \
+		rmdir $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) ; \
+	fi
 
 stamps/cpp-unit-tests-compile.stamp: $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_SRCDIR) $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
 	mkdir -p $(CPP_UNITTEST_DIR) && \
@@ -354,10 +355,9 @@
 	  $(BUILT_CPP_UNIT_TEST_FRAMEWORK) -o $@
 
 clean-cpp-unit-tests: 
-	rm stamps/cpp-unit-tests-compile.stamp &> /dev/null 
-	rm $(CPP_UNITTEST_EXECUTABLE)
-	rm $(CPP_UNITTEST_DIR)/*.o
-	rmdir $(CPP_UNITTEST_DIR) &> /dev/null
+	rm -f stamps/cpp-unit-tests-compile.stamp
+	rm -f $(CPP_UNITTEST_EXECUTABLE)
+	rm -f $(CPP_UNITTEST_DIR)/*.o
 
 run-cpp-unit-tests: $(CPP_UNITTEST_EXECUTABLE)
 	$(CPP_UNITTEST_EXECUTABLE)
@@ -571,6 +571,9 @@
 # ==========================
 
 clean-tests: clean-netx-tests clean-cpp-unit-tests clean-unittest++
+	if [ -e $(CPP_UNITTEST_DIR) ] ; then \
+		rmdir $(CPP_UNITTEST_DIR) ; \
+	fi
 	if [ -e $(TESTS_DIR) ]; then \
 		rmdir $(TESTS_DIR) ; \
 	fi