new "watershed" program copied from liberator:~ian/junk, where I wrote it during...

[chiark-utils.git] / cprogs / Makefile

diff --git a/cprogs/Makefile b/cprogs/Makefile
index 2066d600d2eba9afbd61e6ad5bfaaa42611e5087..6438c983842829a69d5f85a89e0d76f3c0c176c1 100644 (file)
--- a/cprogs/Makefile
+++ b/cprogs/Makefile
@@ -21,47 +21,44 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-CC=            gcc
-CFLAGS=                $(WARNINGS) $(OPTIMISE) $(DEBUG)
-CPPFLAGS=      -DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB)
+include ../settings.make
 
-WARNINGS=      -Wall -Wwrite-strings -Wmissing-prototypes \
-               -Wstrict-prototypes -Wpointer-arith
-OPTIMISE=      -O2
-DEBUG=         -g
 RWBUFFER_SIZE_MB=16
 
-SYSTEM_GROUP=  root
+PROGRAMS=              readbuffer writebuffer with-lock-ex xacpi-simple \
+                       summer watershed
+SUIDSBINPROGRAMS=      really
+DAEMONS=               trivsoundd
+MAN1PAGES=             readbuffer.1 writebuffer.1 with-lock-ex.1
+MAN8PAGES=             trivsoundd.8 really.8
 
-prefix=/usr/local
-
-bindir=$(prefix)/bin
-sbindir=$(prefix)/sbin
-mandir=${prefix}/man
-man1dir=${mandir}/man1
-man8dir=${mandir}/man8
-
-INSTALL=               install -c
-INSTALL_PROGRAM=       $(INSTALL_SCRIPT) -s
-
-PROGRAMS=      readbuffer writebuffer
-DAEMONS=       trivsoundd
-MAN1PAGES=     readbuffer.1 writebuffer.1
-MAN8PAGES=     trivsoundd.8
-
-TARGETS=       $(PROGRAMS) $(DAEMONS)
+TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
 
 all:           $(TARGETS)
 
 readbuffer:                    readbuffer.o                    rwbuffer.o
 writebuffer:                   writebuffer.o   wrbufcore.o     rwbuffer.o 
 trivsoundd:                    trivsoundd.o    wrbufcore.o     rwbuffer.o 
-readbuffer.o writebuffer.o rwbuffer.o wrbufcoore.o:    rwbuffer.h
+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
+
+watershed:     watershed.o
+               $(CC) -o $@ $< -lnettle
 
 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)
                $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
                $(INSTALL_PROGRAM) $(DAEMONS) $(sbindir)
+               $(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
+                       $(SUIDSBINPROGRAMS) $(sbindir)
 
 install-docs:
                $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)