chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert normalisation stuff
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 4726f04c344629cd7dea2626de03e74dd28b196e..15e4ae0f1eb983d28c66d84fe104baf35b875ca8 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
-TARGETS= minimise primer view lumpy.cfm sgtatham.cfm
+TARGETS= minimise primer view lumpy.cfm sgtatham.cfm
ring.cfm
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
@@
-14,7
+14,7
@@
o= >$@.new && mv -f $@.new $@
all: $(TARGETS)
all: $(TARGETS)
-minimise: energy.o
bgl.o common.o mgraph
.o
+minimise: energy.o
graph.o common.o mgraph.o minimise.o half
.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
primer: primer.o common.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
primer: primer.o common.o
@@
-32,6
+32,9
@@
sgtatham.cfm: sgtatham-regenerator prime.data sgtatham/z.typescript
lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
./$^ -o$@
lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
./$^ -o$@
+ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
+ ./$^ -o$@
+
clean:
rm -f prime.data $(TARGETS)
rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
clean:
rm -f prime.data $(TARGETS)
rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~