Mercurial > hg > release > icedtea-web-1.8

changeset 565:4cd65d83965b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix new make targets not cleaning properly
author Adam Domurad <adomurad@redhat.com>
date Wed, 21 Nov 2012 14:18:31 -0500
parents c7b7bd6fffb3
children 754a2eb7731e
files ChangeLog Makefile.am
diffstat 2 files changed, 15 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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@redhat.com>
+
+	* Makefile.am: Fix new clean targets not cleaning properly
+
 2012-11-21  Adam Domurad  <adomurad@redhat.com>
 
 	Support for C++ unit testing with UnitTest++ for IcedTeaWeb.
--- 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