Ensure cmp/mv/rm rules are correct and silent

Make sure the "if cmp ... mv .. rm" in make rules are
correct and useful, and the cmp is silent.

3 files changed, 28 insertions, 24 deletions

diff --git a/TODO b/TODO
index e4cdb68..031fc29 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,10 @@ Release Plans:
 ========================================================================
 
 
+Items starting with "*" have been finished, while those marked with "-"
+still need to be done.
+
+
 nbb-0.1 (done)
  * Start new git repo (get rid of ndim-git-utils history).
  * Clean up git tags.
@@ -11,43 +15,43 @@ nbb-0.1 (done)
 nbb-0.2
  * Make sure the "if cmp ... mv .. rm" in make rules are correct and useful,
    and the cmp is silent.
- * Useful logging infrastructure, and --debug etc user interface.
- * Store config in ${srcdir}/.nbb.conf instead of 'git config'.
+ - Useful logging infrastructure, and --debug etc user interface.
+ - Store config in ${srcdir}/.nbb.conf instead of 'git config'.
    More portable. bzr does not have a config interface, for example.
 
 
 nbb-0.9 or earlier
- * Switch plugins.Foo.validate() functions to different protocol:
+ - Switch plugins.Foo.validate() functions to different protocol:
    Either return or raise an exception.
- * Use different exceptions for plugins signalling detection failure
+ - Use different exceptions for plugins signalling detection failure
    to detect() and detect() to signal "no matching plugin detected"
    to detect()'s caller.
- * BS support: cmake, scons, python setuptools ...
- * VCS support: SVN, darcs, hg, ...
- * Out-of-source builds for systems which require in-source-tree builds:
+ - BS support: cmake, scons, python setuptools ...
+ - VCS support: SVN, darcs, hg, ...
+ - Out-of-source builds for systems which require in-source-tree builds:
    "cp -rl foo.src foo.build"?
- * General removal of redundancy in Python code.
- * More declarative syntax elements in the Python code.
- * Use declarations for command line parsing, and help text generation.
+ - General removal of redundancy in Python code.
+ - More declarative syntax elements in the Python code.
+ - Use declarations for command line parsing, and help text generation.
    Use optparse stuff for both global params and extra optparse stuff
    for each command?
- * Add global --nick or similar option to determine the branch
+ - Add global --nick or similar option to determine the branch
    name to use for composing the pathes.
- * Model different "stages" of e.g. automake builds as distinct objects,
+ - Model different "stages" of e.g. automake builds as distinct objects,
    including proper dependency detectors, and stuff? OK, we're not going
    to duplicate scons here.
- * Bash syntax completion, ideally autogenerated
- * Docs:
-    * Write docs: README, NEWS, HACKING.
-    * Man page or something similar. Generate from help texts?
- * Command aliases:
+ - Bash syntax completion, ideally autogenerated
+ - Docs:
+    - Write docs: README, NEWS, HACKING.
+    - Man page or something similar. Generate from help texts?
+ - Command aliases:
      make -> build    (for automake, or similar mapping)
- * Make automake's "nbb make" depend on configure etc.
- * Test sh command like run command.
+ - Make automake's "nbb make" depend on configure etc.
+ - Test sh command like run command.
 
 
 nbb-1.0
- * Make public release.
+ - Make public release.
 
 
 ========================================================================
diff --git a/src/Makefile-files b/src/Makefile-files
index ef00d5f..490ff31 100644
--- a/src/Makefile-files
+++ b/src/Makefile-files
@@ -65,7 +65,7 @@ all-local-nbblib-pydoc: all-local-nbblib
 		if test "$$rebuild" = "yes"; then \
 			echo $(PYDOC) -w "$${mod}"; \
 			( cd src && $(PYDOC) -w "$${mod}" ); \
-			if test -f "$$htmlfile" && cmp "src/$${mod}.html" "$$htmlfile"; \
+			if test -f "$$htmlfile" && cmp "src/$${mod}.html" "$$htmlfile" > /dev/null; \
 			then rm -f "src/$${mod}.html"; \
 			else echo "INFO: Updating pydoc/$${mod}.html"; \
 			     mv -f "src/$${mod}.html" "$$htmlfile"; fi; \
@@ -99,7 +99,7 @@ src/nbb: src/nbb.in $(nodist_nbblib_PYTHON) $(nbblib_PYTHON) Makefile
 		$(GREP) '@[a-zA-Z0-9_]\{1,\}@' src/nbb.new; \
 		exit 1; \
 	fi
-	@if test -f src/nbb && cmp src/nbb.new src/nbb; \
+	@if test -f src/nbb && cmp src/nbb.new src/nbb > /dev/null; \
 	then rm -f src/nbb.new; \
 	else mv -f src/nbb.new src/nbb; echo "INFO: Updating src/nbb"; fi
 	@chmod +x src/nbb
diff --git a/test/Makefile.am b/test/Makefile.am
index acb26d8..3a87f6b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -87,7 +87,7 @@ $(srcdir)/testsuite.at: $(TESTCASES) Makefile.in
 		done; \
 	} > testsuite.at.new
 	@if test -f $(srcdir)/testsuite.at \
-	 && cmp testsuite.at.new $(srcdir)/testsuite.at; \
+	 && cmp testsuite.at.new $(srcdir)/testsuite.at > /dev/null; \
 	then rm -f testsuite.at.new; \
 	else echo "INFO: Updating $(srcdir)/testsuite.at"; \
 	     mv -f testsuite.at.new $(srcdir)/testsuite.at; fi
@@ -99,7 +99,7 @@ $(srcdir)/$(TESTSUITE): testsuite.at local.at package.m4 $(TESTCASES)
 	AUTOM4TE="$(AUTOM4TE)"; \
 	if test "x$${AUTOM4TE}" = "x"; then AUTOM4TE="autom4te"; fi; \
 	$${AUTOM4TE} --language=autotest -I '$(srcdir)' -o $(TESTSUITE).tmp $(srcdir)/testsuite.at
-	@if test -f $(srcdir)/$(TESTSUITE) && cmp $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); \
+	@if test -f $(srcdir)/$(TESTSUITE) && cmp $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE) > /dev/null; \
 	then rm -f $(TESTSUITE).tmp; \
 	else echo "INFO: Updating $(srcdir)/$(TESTSUITE)"; \
 	     mv -f $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); fi