chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
makedim multidim experiment
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 15e4ae0f1eb983d28c66d84fe104baf35b875ca8..af7486da4c0eed0e80cd6e0938b21495db05d6cc 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
@@
-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
@@
-42,5
+43,6
@@
clean:
realclean: clean
rm -f best
realclean: clean
rm -f best
+ rm -rf dim,*
-include *.d
-include *.d