update licence to GPLv3 or later (was GPLv2 or later).

[chiark-utils.git] / cprogs / Makefile

diff --git a/cprogs/Makefile b/cprogs/Makefile
index ab1b6c923cc5df7d7a1741e442ba974f964dab11..31184ff33eef39a25d3ce27a99017d73f8831ea1 100644 (file)
--- 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
@@ -25,10 +25,11 @@ 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)