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
xduplic-copier: an attempt at correct library dependencies
[chiark-utils.git]
/
cprogs
/
Makefile
diff --git
a/cprogs/Makefile
b/cprogs/Makefile
index d328bf52416535031e6fb416e428ed7b9feafe34..3dcc0e74da5f8d33acdf28b62f56093fc34a30a3 100644
(file)
--- a/
cprogs/Makefile
+++ b/
cprogs/Makefile
@@
-28,10
+28,11
@@
include ../settings.make
RWBUFFER_SIZE_MB=16
PROGRAMS= readbuffer writebuffer with-lock-ex xbatmon-simple \
RWBUFFER_SIZE_MB=16
PROGRAMS= readbuffer writebuffer with-lock-ex xbatmon-simple \
- summer watershed rcopy-repeatedly
+ 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
BUILTTXTDOCS= watershed.txt
TXTDOCS= $(BUILTTXTDOCS)
MAN8PAGES= trivsoundd.8 really.8
BUILTTXTDOCS= watershed.txt
TXTDOCS= $(BUILTTXTDOCS)
@@
-48,17
+49,19
@@
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
really.o myopt.o rcopy-repeatedly.o: myopt.h
readbuffer.o writebuffer.o rwbuffer.o wrbufcore.o trivsoundd.o: rwbuffer.h
-xbatmon-simple: xbatmon-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
summer: summer.o
-
$(CC) -o $@ $<
-lnettle -lgmp
+
summer: LDLIBS +=
-lnettle -lgmp
rcopy-repeatedly: rcopy-repeatedly.o myopt.o
rcopy-repeatedly: rcopy-repeatedly.o myopt.o
-
$(CC) -o $@ $^
-lm -lrt
+
rcopy-repeatedly: LDLIBS +=
-lm -lrt
watershed: watershed.o
watershed: watershed.o
-
$(CC) -o $@ $<
-lnettle -lgmp
+
watershed: LDLIBS +=
-lnettle -lgmp
watershed.txt: watershed.c
sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
watershed.txt: watershed.c
sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
@@
-79,7
+82,7
@@
install-docs: watershed.txt
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)