X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=cprogs%2FMakefile;h=496b33ee1902b90c6b4b4e09cbb4cbd4187a5593;hp=5a349c10c2489364ab255da37d0da00211cc6bf3;hb=96f381820f6b2f532a1f166b628ff7f5f7e12908;hpb=8c949adf77235b0610aeac3181843bbf10ddcd6d

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 5a349c1..496b33e 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-interp
 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,22 +57,27 @@ 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
+xduplic-copier: LDLIBS += -lXmu -lSM -lICE -lXt -lXext
+xduplic-copier: LDLIBS += -lX11 -lxcb -lXau -lXdmcp
 
 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 common.o
+watershed:	LDLIBS += -lnettle -lgmp
 
-watershed:	watershed.o
-		$(CC) -o $@ $< -lnettle -lgmp
+cgi-fcgi-interp:	cgi-fcgi-interp.o	myopt.o common.o
+cgi-fcgi-interp:	LDLIBS += -lnettle -lgmp
 
 watershed.txt:	watershed.c
 		sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@