* watershed; Provide -h and --help options. Closes:#659989.
Build and portability fixes:
+ * Makefile: honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.
* xbatmon-simple: Saner build rune.
* cprogs/Makefile: clean deletes $PROGRAMS
* random-word: Some perl-mode emacs formatting glitch workarounds.
-DREALLY_CHECK_FILE='"/etc/inittab"'
CC= gcc
-CFLAGS= $(WARNINGS) $(OPTIMISE) $(DEBUG)
-CPPFLAGS= $(CONFIG_CPPFLAGS)
+CFLAGS= $(WARNINGS) $(OPTIMISE) $(DEBUG) $(CMDLINE_CFLAGS)
+CPPFLAGS= $(CONFIG_CPPFLAGS) $(CMDLINE_CPPFLAGS)
+LDFLAGS= $(CMDLINE_LDFLAGS)
WARNINGS= -Wall -Wwrite-strings -Wmissing-prototypes \
-Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign