changelog: finalise 5.0.0

[chiark-utils.git] / cprogs / Makefile

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 77e14e22204e0cdb090fb930b8e65d49feeac4b1..0e60a4feff0be08ce41214754b4e9b99a3b92843 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -29,13 +29,15 @@ RWBUFFER_SIZE_MB=16
 
 PROGRAMS=              readbuffer writebuffer with-lock-ex xbatmon-simple \
                        summer watershed rcopy-repeatedly xduplic-copier \
-                       cgi-fcgi-perl
+                       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 \
@@ -58,15 +60,15 @@ writebuffer:                        writebuffer.o   wrbufcore.o     rwbuffer.o
 trivsoundd:                    trivsoundd.o    wrbufcore.o     rwbuffer.o 
 really:                                really.o myopt.o
 acctdump:                      acctdump.o      myopt.o
-cgi-fcgi-perl:                 cgi-fcgi-perl.o myopt.o
 
 acctdump.o really.o myopt.o rcopy-repeatedly.o: myopt.h
 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
@@ -74,10 +76,13 @@ summer:             LDLIBS += -lnettle -lgmp
 rcopy-repeatedly: rcopy-repeatedly.o myopt.o
 rcopy-repeatedly: LDLIBS += -lm -lrt
 
-watershed:     watershed.o
+watershed:     watershed.o common.o
 watershed:     LDLIBS += -lnettle -lgmp
 
-watershed.txt: watershed.c
+cgi-fcgi-interp:       cgi-fcgi-interp.o       myopt.o common.o
+cgi-fcgi-interp:       LDLIBS += -lnettle
+
+$(SEDDERYDOCS): %.txt: %.c
                sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
 
 install:               all
@@ -87,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}/.