X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=cprogs%2FMakefile;h=141dbc0b107e78417ac63faf17c546afb3859852;hb=2c444eebd71ff12a6c29ffaa91d2e716c8f9ca6e;hp=2066d600d2eba9afbd61e6ad5bfaaa42611e5087;hpb=e483a046db5ff0972702a0dc29ba4e00b698d997;p=chiark-utils.git

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 2066d60..141dbc0 100644
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -21,29 +21,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-CC=		gcc
-CFLAGS=		$(WARNINGS) $(OPTIMISE) $(DEBUG)
-CPPFLAGS=	-DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB)
+include ../settings.make
 
-WARNINGS=	-Wall -Wwrite-strings -Wmissing-prototypes \
-		-Wstrict-prototypes -Wpointer-arith
-OPTIMISE=	-O2
-DEBUG=		-g
 RWBUFFER_SIZE_MB=16
 
-SYSTEM_GROUP=	root
-
-prefix=/usr/local
-
-bindir=$(prefix)/bin
-sbindir=$(prefix)/sbin
-mandir=${prefix}/man
-man1dir=${mandir}/man1
-man8dir=${mandir}/man8
-
-INSTALL=		install -c
-INSTALL_PROGRAM=	$(INSTALL_SCRIPT) -s
-
 PROGRAMS=	readbuffer writebuffer
 DAEMONS=	trivsoundd
 MAN1PAGES=	readbuffer.1 writebuffer.1
@@ -56,7 +37,7 @@ all:		$(TARGETS)
 readbuffer:			readbuffer.o			rwbuffer.o
 writebuffer:			writebuffer.o	wrbufcore.o	rwbuffer.o 
 trivsoundd:			trivsoundd.o	wrbufcore.o 	rwbuffer.o 
-readbuffer.o writebuffer.o rwbuffer.o wrbufcoore.o:	rwbuffer.h
+readbuffer.o writebuffer.o rwbuffer.o wrbufcore.o trivsoundd.o:	rwbuffer.h
 
 install:		all
 		$(INSTALL_DIRECTORY) $(bindir) $(sbindir)