chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of makedim multidim experiment
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index e1a54dd723204884cda7c5f36ae03ac2d2747156..9b8d469e1fce744bfaee6a7a5bdb29ec93be224d 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,11
+1,12
@@
TARGETS= minimise primer view lumpy.cfm sgtatham.cfm ring.cfm
TARGETS= minimise primer view lumpy.cfm sgtatham.cfm ring.cfm
+SGTATHAM=sgtatham
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
OPTIMISE= -O2
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
OPTIMISE= -O2
-CFLAGS= -MMD $(OPTIMISE) -g $(CWARNS)
+CFLAGS= -MMD $(OPTIMISE) -g $(CWARNS)
$(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
LIBGSL= -lgsl -lgslcblas
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
LIBGSL= -lgsl -lgslcblas
@@
-14,7
+15,7
@@
o= >$@.new && mv -f $@.new $@
all: $(TARGETS)
all: $(TARGETS)
-minimise: energy.o graph.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
@@
-26,7
+27,7
@@
prime.data: primer
view: view.o common.o mgraph.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
view: view.o common.o mgraph.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
-sgtatham.cfm: sgtatham-regenerator prime.data
sgtatham
/z.typescript
+sgtatham.cfm: sgtatham-regenerator prime.data
$(SGTATHAM)
/z.typescript
./$^ -T -o$@
lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
./$^ -T -o$@
lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out