X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=cprogs%2FMakefile;h=584cda1d506cc71d7dd36dd38c9adda9207d81f0;hb=57402060f26eda526a661778ffbbb1c4b8fcb8ae;hp=ab1b6c923cc5df7d7a1741e442ba974f964dab11;hpb=a6d8af82c47d8cc2dccca89c953d42ee9e753424;p=chiark-utils.git

diff --git a/cprogs/Makefile b/cprogs/Makefile
index ab1b6c9..584cda1 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,17 +18,18 @@
 # 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.
 
 include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 
-PROGRAMS=		readbuffer writebuffer
+PROGRAMS=		readbuffer writebuffer with-lock-ex xacpi-simple \
+			summer watershed
 SUIDSBINPROGRAMS=	really
 DAEMONS=		trivsoundd
-MAN1PAGES=		readbuffer.1 writebuffer.1
+MAN1PAGES=		readbuffer.1 writebuffer.1 with-lock-ex.1
 MAN8PAGES=		trivsoundd.8 really.8
 
 TARGETS=	$(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
@@ -43,6 +44,15 @@ really:				really.o myopt.o
 really.o myopt.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
+
+watershed:	watershed.o
+		$(CC) -o $@ $< -lnettle -lgmp
+
 install:		all
 		$(INSTALL_DIRECTORY) $(bindir) $(sbindir)
 		$(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)