chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/dgit/dgit/sid'
[chiark-utils.git]
/
cprogs
/
Makefile
diff --git
a/cprogs/Makefile
b/cprogs/Makefile
index dbfad383c34f918c14b97ecd197eecd7ca4d2f40..5a349c10c2489364ab255da37d0da00211cc6bf3 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
#
# 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
#
# 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
# 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
include ../settings.make
RWBUFFER_SIZE_MB=16
-PROGRAMS= readbuffer writebuffer with-lock-ex x
acpi
-simple \
- summer
+PROGRAMS= readbuffer writebuffer with-lock-ex x
batmon
-simple \
+ summer
watershed rcopy-repeatedly xduplic-copier
SUIDSBINPROGRAMS= really
DAEMONS= trivsoundd
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
MAN8PAGES= trivsoundd.8 really.8
+BUILTTXTDOCS= watershed.txt
+TXTDOCS= $(BUILTTXTDOCS)
-TARGETS= $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
+TARGETS= $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
$(BUILTTXTDOCS)
all: $(TARGETS)
all: $(TARGETS)
@@
-41,14
+46,24
@@
writebuffer: writebuffer.o wrbufcore.o rwbuffer.o
trivsoundd: trivsoundd.o wrbufcore.o rwbuffer.o
really: really.o myopt.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
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
summer: summer.o
- $(CC) -o $@ $< -lnettle
+ $(CC) -o $@ $< -lnettle -lgmp
+
+rcopy-repeatedly: rcopy-repeatedly.o myopt.o
+ $(CC) -o $@ $^ -lm -lrt
+
+watershed: watershed.o
+ $(CC) -o $@ $< -lnettle -lgmp
+
+watershed.txt: watershed.c
+ sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
install: all
$(INSTALL_DIRECTORY) $(bindir) $(sbindir)
install: all
$(INSTALL_DIRECTORY) $(bindir) $(sbindir)
@@
-57,15
+72,16
@@
install: all
$(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
$(SUIDSBINPROGRAMS) $(sbindir)
$(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_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)
$(INSTALL) -m 644 $(MAN1PAGES) ${man1dir}/.
$(INSTALL) -m 644 $(MAN8PAGES) ${man8dir}/.
+ $(INSTALL) -m 644 $(TXTDOCS) ${txtdocdir}/.
install-examples:
clean:
install-examples:
clean:
- rm -f *~ ./#*# *.o
+ rm -f *~ ./#*# *.o
$(PROGRAMS)
distclean realclean: clean
rm -f $(TARGETS)
distclean realclean: clean
rm -f $(TARGETS)