consolidate changelog

[chiark-utils.git] / cprogs / Makefile

diff --git a/cprogs/Makefile b/cprogs/Makefile
index baa0a02575cddeae7682121929f63c473e13dc8b..dbfad383c34f918c14b97ecd197eecd7ca4d2f40 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -25,11 +25,12 @@ include ../settings.make
 
 RWBUFFER_SIZE_MB=16
 
-PROGRAMS=              readbuffer writebuffer
+PROGRAMS=              readbuffer writebuffer with-lock-ex xacpi-simple \
+                       summer
 SUIDSBINPROGRAMS=      really
 DAEMONS=               trivsoundd
-MAN1PAGES=             readbuffer.1 writebuffer.1
-MAN8PAGES=             trivsoundd.8
+MAN1PAGES=             readbuffer.1 writebuffer.1 with-lock-ex.1
+MAN8PAGES=             trivsoundd.8 really.8
 
 TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
 
@@ -43,11 +44,17 @@ 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
+
 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)
                $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
                $(INSTALL_PROGRAM) $(DAEMONS) $(sbindir)
-               $(INSTALL) -m 4774 root.$(SYSTEM_GROUP) \
+               $(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
                        $(SUIDSBINPROGRAMS) $(sbindir)
 
 install-docs: