X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=cprogs%2FMakefile;h=0e60a4feff0be08ce41214754b4e9b99a3b92843;hp=3dcc0e74da5f8d33acdf28b62f56093fc34a30a3;hb=a14cb06ac8fff27e407a39993b2b20f9a7109f7c;hpb=3e600ee7c558d5580faa078da0a8bcb8923dc45c

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 3dcc0e7..0e60a4f 100644
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -28,15 +28,29 @@ 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 \
+	printf "\#include <sys/types.h>\n\#include <sys/acct.h>" \
+		| $(CC) -E - 2>&1 >/dev/null \
+)
+ifeq (,$(acctdump_cc_out))
+PROGRAMS+=acctdump
+MAN8PAGES+=acctdump.8
+else
+$(warning Not building acctdump: $(acctdump_cc_out))
+endif
+
 TARGETS=	$(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS) $(BUILTTXTDOCS)
 
 all:		$(TARGETS)
@@ -45,14 +59,16 @@ readbuffer:			readbuffer.o			rwbuffer.o
 writebuffer:			writebuffer.o	wrbufcore.o	rwbuffer.o 
 trivsoundd:			trivsoundd.o	wrbufcore.o 	rwbuffer.o 
 really:				really.o myopt.o
+acctdump:			acctdump.o	myopt.o
 
-really.o myopt.o rcopy-repeatedly.o: myopt.h
+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 -lXdmcmp
+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
@@ -60,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
@@ -73,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}/.