X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=cprogs%2FMakefile;h=e9f19e01bc7f12caeb9d8a3f4c59be337acc0833;hb=2b3cc36bdcf6cf04e27ce95bcc00d8e3a78f5d30;hp=fb2d9fb42c326b1ea7e2e4380c4fdf9b1645f856;hpb=9e194d5bb088d41e7aa29042090b94d23a4ecb79;p=chiark-utils.git

diff --git a/cprogs/Makefile b/cprogs/Makefile
index fb2d9fb..e9f19e0 100644
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -10,7 +10,7 @@
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2, or (at your option) any later version.
+# Foundation; either version 3, or (at your option) any later version.
 #
 # This is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -18,50 +18,50 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
-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
+PROGRAMS=		readbuffer writebuffer with-lock-ex xacpi-simple \
+			summer watershed rcopy-repeatedly
+SUIDSBINPROGRAMS=	really
+DAEMONS=		trivsoundd
+MAN1PAGES=		readbuffer.1 writebuffer.1 with-lock-ex.1
+MAN8PAGES=		trivsoundd.8 really.8
 
-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
-MAN8PAGES=	trivsoundd.8
-
-TARGETS=	$(PROGRAMS) $(DAEMONS)
+TARGETS=	$(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
 
 all:		$(TARGETS)
 
 readbuffer:			readbuffer.o			rwbuffer.o
 writebuffer:			writebuffer.o	wrbufcore.o	rwbuffer.o 
 trivsoundd:			trivsoundd.o	wrbufcore.o 	rwbuffer.o 
+really:				really.o myopt.o
+
+really.o myopt.o rcopy-repeatedly.o: myopt.h
 readbuffer.o writebuffer.o rwbuffer.o wrbufcore.o trivsoundd.o:	rwbuffer.h
 
+xacpi-simple:	xacpi-simple.o
+		$(CC) -o $@ $< -L/usr/X11R6/lib -lX11 -lm
+
+summer:		summer.o
+		$(CC) -o $@ $< -lnettle -lgmp
+
+rcopy-repeatedly: rcopy-repeatedly.o myopt.o
+		$(CC) -o $@ $^ -lm -lrt
+
+watershed:	watershed.o
+		$(CC) -o $@ $< -lnettle -lgmp
+
 install:		all
 		$(INSTALL_DIRECTORY) $(bindir) $(sbindir)
 		$(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
 		$(INSTALL_PROGRAM) $(DAEMONS) $(sbindir)
+		$(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
+			$(SUIDSBINPROGRAMS) $(sbindir)
 
 install-docs:
 		$(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)