Merge remote-tracking branch 'remotes/dgit/dgit/sid'

[chiark-utils.git] / cprogs / Makefile

diff --git a/cprogs/Makefile b/cprogs/Makefile
index a936e642f60a741c6a2f57220ff40e3ccb6159d7..5a349c10c2489364ab255da37d0da00211cc6bf3 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -27,11 +27,12 @@ include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 
-PROGRAMS=              readbuffer writebuffer with-lock-ex xacpi-simple \
-                       summer watershed rcopy-repeatedly
+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)
@@ -48,8 +49,9 @@ 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
+xbatmon-simple: LDLIBS += -lX11 -lm
+
+xduplic-copier: LDLIBS += -lXmu
 
 summer:                summer.o
                $(CC) -o $@ $< -lnettle -lgmp
@@ -79,7 +81,7 @@ install-docs: watershed.txt
 install-examples:
 
 clean:
-               rm -f *~ ./#*# *.o
+               rm -f *~ ./#*# *.o $(PROGRAMS)
 
 distclean realclean:   clean
                rm -f $(TARGETS)