chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build more stuff
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 927f45d1a8e60855abc87ebb43f1652cc1f26387..706c35af1f06b2e09142dfbee730d62a178a96e6 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,7
+2,7
@@
ALLDIMS=33 64 125 246 487 968
TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
ALLDIMS=33 64 125 246 487 968
TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
- minimise-33 minimise-64 \
+ minimise-33 minimise-64
minimise-125 minimise-246
\
$(addprefix interpolate-, $(ALLDIMS)) \
$(addprefix view-, $(ALLDIMS)) \
$(addprefix output-, $(ALLDIMS))
$(addprefix interpolate-, $(ALLDIMS)) \
$(addprefix view-, $(ALLDIMS)) \
$(addprefix output-, $(ALLDIMS))
@@
-11,7
+11,7
@@
SGTATHAM=sgtatham
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
-OPTIMISE= -O
2
+OPTIMISE= -O
3
CFLAGS_UNIPROC= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
CFLAGS= $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
CFLAGS_UNIPROC= -MMD $(OPTIMISE) -g $(CWARNS) $(DIMCFLAGS)
CXXFLAGS= -MMD $(OPTIMISE) -g $(CXXWARNS)
CFLAGS= $(CFLAGS_UNIPROC) $(NPROCCFLAGS)
@@
-24,7
+24,8
@@
all: $(TARGETS)
compute: all
$(MAKE) best-33.CFM
compute: all
$(MAKE) best-33.CFM
- $(MAKE) best-968.CFM
+ $(MAKE) best-64.CFM
+# $(MAKE) best-968.CFM
minimise: energy.o graph.o common.o mgraph.o minimise.o half.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
minimise: energy.o graph.o common.o mgraph.o minimise.o half.o
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
@@
-120,10
+121,10
@@
interpolate+%.o: interpolate.c
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.* *~
- rm -f *.d
*.cfm
+ rm -f *.d
.alternately_*
realclean: clean
realclean: clean
- rm -f *.CFM
+ rm -f *.
cfm *.
CFM
%.d:
%.d: