cprogs: Saner build runes for summer, watershed and rcopy-repeatedly

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 5a349c10c2489364ab255da37d0da00211cc6bf3..549b13e20a92fac284f8bc1d4ea1e369ec5afe5f 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -54,13 +54,13 @@ xbatmon-simple: LDLIBS += -lX11 -lm
 xduplic-copier: LDLIBS += -lXmu
 
 summer:                summer.o
-               $(CC) -o $@ $< -lnettle -lgmp
+summer:                LDLIBS += -lnettle -lgmp
 
 rcopy-repeatedly: rcopy-repeatedly.o myopt.o
-               $(CC) -o $@ $^ -lm -lrt
+rcopy-repeatedly: LDLIBS += -lm -lrt
 
 watershed:     watershed.o
-               $(CC) -o $@ $< -lnettle -lgmp
+watershed:     LDLIBS += -lnettle -lgmp
 
 watershed.txt: watershed.c
                sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@

diff --git a/debian/changelog b/debian/changelog
index ab7b0c3d86796721dc8c892ff469123ea1bc0cc5..9c7c5cf7d02c023af3b12d2896fd3ef21a69190b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,9 +22,9 @@ chiark-utils (4.3.0) unstable; urgency=medium
   * watershed; Provide -h and --help options.  Closes:#659989.
 
   Build and portability fixes:
-  * Makefile: honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.
+  * cprogs: Saner build runes when extra libs or objs needed.
+  * cprogs: Honour CMDLINE_CFLAGS, CMDLINE_CPPFLAGS, CMDLINE_LDFLAGS.
   * debian/rules: use dpkg-buildflags and pass to Makefile.
-  * xbatmon-simple: Saner build rune.
   * cprogs/Makefile: clean deletes $PROGRAMS
   * random-word: Some perl-mode emacs formatting glitch workarounds.
   * random-word: use strict; -w.