fishdescriptor: fix error handling

[chiark-utils.git] / cprogs / Makefile

diff --git a/cprogs/Makefile b/cprogs/Makefile
index c64a984f22e291cd98857c14f42230138d32807b..0e60a4feff0be08ce41214754b4e9b99a3b92843 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -28,13 +28,16 @@ include ../settings.make
 RWBUFFER_SIZE_MB=16
 
 PROGRAMS=              readbuffer writebuffer with-lock-ex xbatmon-simple \
-                       summer watershed rcopy-repeatedly xduplic-copier
+                       summer watershed rcopy-repeatedly xduplic-copier \
+                       cgi-fcgi-interp
 SUIDSBINPROGRAMS=      really
 DAEMONS=               trivsoundd
 MAN1PAGES=             readbuffer.1 writebuffer.1 with-lock-ex.1 \
-                       xduplic-copier.1
+                       xduplic-copier.1 summer.1
 MAN8PAGES=             trivsoundd.8 really.8
-BUILTTXTDOCS=          watershed.txt
+SEDDERYDOCS=           watershed.txt cgi-fcgi-interp.txt \
+                       xbatmon-simple.txt rcopy-repeatedly.txt
+BUILTTXTDOCS=          $(SEDDERYDOCS)
 TXTDOCS=               $(BUILTTXTDOCS)
 
 acctdump_cc_out:=$(shell \
@@ -63,8 +66,9 @@ readbuffer.o writebuffer.o rwbuffer.o wrbufcore.o trivsoundd.o:       rwbuffer.h
 
 xbatmon-simple: LDLIBS += -lX11 -lm
 
-xduplic-copier: LDLIBS += -lXmu -lSM -lICE -lXt -lXext
-xduplic-copier: LDLIBS += -lX11 -lxcb -lXau -lXdmcp
+xduplic-copier: LDLIBS += -lXmu -lX11
+#xduplic-copier: LDLIBS += -lXmu -lSM -lICE -lXt -lXext
+#xduplic-copier: LDLIBS += -lX11 -lxcb -lXau -lXdmcp
 
 summer:                summer.o
 summer:                LDLIBS += -lnettle -lgmp
@@ -76,9 +80,9 @@ watershed:    watershed.o common.o
 watershed:     LDLIBS += -lnettle -lgmp
 
 cgi-fcgi-interp:       cgi-fcgi-interp.o       myopt.o common.o
-cgi-fcgi-interp:       LDLIBS += -lnettle -lgmp
+cgi-fcgi-interp:       LDLIBS += -lnettle
 
-watershed.txt: watershed.c
+$(SEDDERYDOCS): %.txt: %.c
                sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
 
 install:               all
@@ -88,7 +92,7 @@ install:              all
                $(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
                        $(SUIDSBINPROGRAMS) $(sbindir)
 
-install-docs:  watershed.txt
+install-docs:  $(TXTDOCS)
                $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)
                $(INSTALL) -m 644 $(MAN1PAGES) ${man1dir}/.
                $(INSTALL) -m 644 $(MAN8PAGES) ${man8dir}/.