X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=cprogs%2FMakefile;h=3dcc0e74da5f8d33acdf28b62f56093fc34a30a3;hp=01f375d0e5070606bac63414e020587ae28af5d5;hb=3e600ee7c558d5580faa078da0a8bcb8923dc45c;hpb=e2ce6698329809a11a59e1c3054acce472e766c4

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 01f375d..3dcc0e7 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,21 +18,26 @@
 # 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.
+
+us=	chiark-utils-bin
 
 include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 
-PROGRAMS=		readbuffer writebuffer with-lock-ex xacpi-simple \
-			summer watershed
+PROGRAMS=		readbuffer writebuffer with-lock-ex xbatmon-simple \
+			summer watershed rcopy-repeatedly xduplic-copier
 SUIDSBINPROGRAMS=	really
 DAEMONS=		trivsoundd
-MAN1PAGES=		readbuffer.1 writebuffer.1 with-lock-ex.1
+MAN1PAGES=		readbuffer.1 writebuffer.1 with-lock-ex.1 \
+			xduplic-copier.1
 MAN8PAGES=		trivsoundd.8 really.8
+BUILTTXTDOCS=		watershed.txt
+TXTDOCS=		$(BUILTTXTDOCS)
 
-TARGETS=	$(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
+TARGETS=	$(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS) $(BUILTTXTDOCS)
 
 all:		$(TARGETS)
 
@@ -41,17 +46,25 @@ writebuffer:			writebuffer.o	wrbufcore.o	rwbuffer.o
 trivsoundd:			trivsoundd.o	wrbufcore.o 	rwbuffer.o 
 really:				really.o myopt.o
 
-really.o myopt.o: myopt.h
+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
+xbatmon-simple: LDLIBS += -lX11 -lm
+
+xduplic-copier: LDLIBS += -lXmu -lSM -lICE -lXt -lXext
+xduplic-copier: LDLIBS += -lX11 -lxcb -lXau -lXdmcmp
 
 summer:		summer.o
-		$(CC) -o $@ $< -lnettle -lgmp
+summer:		LDLIBS += -lnettle -lgmp
+
+rcopy-repeatedly: rcopy-repeatedly.o myopt.o
+rcopy-repeatedly: LDLIBS += -lm -lrt
 
 watershed:	watershed.o
-		$(CC) -o $@ $< -lnettle -lgmp
+watershed:	LDLIBS += -lnettle -lgmp
+
+watershed.txt:	watershed.c
+		sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
 
 install:		all
 		$(INSTALL_DIRECTORY) $(bindir) $(sbindir)
@@ -60,15 +73,16 @@ install:		all
 		$(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
 			$(SUIDSBINPROGRAMS) $(sbindir)
 
-install-docs:
+install-docs:	watershed.txt
 		$(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)
 		$(INSTALL) -m 644 $(MAN1PAGES) ${man1dir}/.
 		$(INSTALL) -m 644 $(MAN8PAGES) ${man8dir}/.
+		$(INSTALL) -m 644 $(TXTDOCS) ${txtdocdir}/.
 
 install-examples:
 
 clean:
-		rm -f *~ ./#*# *.o
+		rm -f *~ ./#*# *.o $(PROGRAMS)
 
 distclean realclean:	clean
 		rm -f $(TARGETS)