chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ports to new c++ in lenny
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index fc74681e0e4b665f103753745e045dc5df7cd339..12f1eee73edbf688c5a3ca3c1f86e273813191d4 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,11
+1,12
@@
-TARGETS= minimise primer initial
+TARGETS= minimise primer initial
view
-CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror
+CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
+CXXWARNS= $(CWARNS) -Wno-shadow -Wno-error
OPTIMISE= -O2
OPTIMISE= -O2
-CFLAGS=
$(CWARNS) $(OPTIMISE) -g
-CXXFLAGS=
$(CWARNS) $(OPTIMISE) -g
+CFLAGS=
-MMD $(OPTIMISE) -g $(CWARNS)
+CXXFLAGS=
-MMD $(OPTIMISE) -g $(CXXWARNS)
LIBGSL= -lgsl -lgslcblas
LIBGSL= -lgsl -lgslcblas
@@
-17,11
+18,18
@@
minimise: energy.o bgl.o common.o mgraph.o
primer: primer.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
primer: primer.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+view: view.o common.o mgraph.o
+ $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+
initial: generator primer sgtatham/z.typescript
./$^ -o$@
clean:
initial: generator primer sgtatham/z.typescript
./$^ -o$@
clean:
- rm -f *.o $(TARGETS) *.new *.tmp
- rm -f best initial
+ rm -f *.o $(TARGETS) *.new *.tmp *.rej *.orig
+ rm -f initial
+ rm -f *.d
+
+realclean: clean
+ rm -f best
-%.o:: common.h mgraph.h bgl.h
+-include *.d