watershed, common: Break out m_[v]asprintf into common.c (nfc0

[chiark-utils.git] / cprogs / Makefile

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 64f388d6c8662d86103d484d180404e9b4a3ed6b..c07dbdc321b3bf9f5462d27f57a80aa67cb79af1 100644 (file)
--- 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,8 +57,10 @@ 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
+cgi-fcgi-perl:                 cgi-fcgi-perl.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
@@ -60,7 +74,7 @@ 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