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

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 3dcc0e7..7bb1e27 100644
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -28,7 +28,8 @@ 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-perl
 SUIDSBINPROGRAMS=	really
 DAEMONS=		trivsoundd
 MAN1PAGES=		readbuffer.1 writebuffer.1 with-lock-ex.1 \
@@ -37,6 +38,17 @@ MAN8PAGES=		trivsoundd.8 really.8
 BUILTTXTDOCS=		watershed.txt
 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 +57,15 @@ 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 += -lX11 -lxcb -lXau -lXdmcp
 
 summer:		summer.o
 summer:		LDLIBS += -lnettle -lgmp
@@ -60,9 +73,12 @@ 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
 
+cgi-fcgi-perl:	cgi-fcgi-perl.o	myopt.o common.o
+cgi-fcgi-perl:	LDLIBS += -lnettle -lgmp
+
 watershed.txt:	watershed.c
 		sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@