chiark / gitweb /
cprogs: Saner build runes for summer, watershed and rcopy-repeatedly
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:50:50 +0000 (20:50 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 29 Nov 2013 20:50:50 +0000 (20:50 +0000)
cprogs/Makefile
debian/changelog

index 5a349c1..549b13e 100644 (file)
@@ -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 $@
index ab7b0c3..9c7c5cf 100644 (file)
@@ -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.