chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
best so far perhaps
[moebius2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 899bed653212c8d60029912e09bb0e1cd025fc05..b41c543b25f800691cda9c7b3c198b39a76faea8 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-4,7
+4,8
@@
ALLDIMS=33 64 125 246 487 968
TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
minimise-33 minimise-64 \
$(addprefix interpolate-, $(ALLDIMS)) \
TARGETS= primer lumpy.cfm sgtatham.cfm ring.cfm \
minimise-33 minimise-64 \
$(addprefix interpolate-, $(ALLDIMS)) \
- $(addprefix view-, $(ALLDIMS))
+ $(addprefix view-, $(ALLDIMS)) \
+ $(addprefix output-, $(ALLDIMS))
SGTATHAM=sgtatham
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
SGTATHAM=sgtatham
CWARNS= -Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
@@
-66,6
+67,9
@@
$(eval $(call interpolate_aa,125, best-64.CFM))
view-%: view+%.o mgraph+%.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
view-%: view+%.o mgraph+%.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+output-%: output+%.o mgraph+%.o common.o
+ $(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
+
interpolate-%: interpolate+%.o mgraph+%.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
interpolate-%: interpolate+%.o mgraph+%.o common.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
@@
-77,6
+81,9
@@
minimise-%: energy+%.o graph+%.o mgraph+%.o minimise+%.o half+%.o common.o
view+%.o: view.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
view+%.o: view.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+output+%.o: output.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
mgraph+%.o: mgraph.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
mgraph+%.o: mgraph.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
@@
-95,7
+102,7
@@
half+%.o: half.c
interpolate+%.o: interpolate.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
interpolate+%.o: interpolate.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
-.PRECIOUS: view+%.o mgraph+%.o interpolate+%.o
+.PRECIOUS: view+%.o
output+%.o
mgraph+%.o interpolate+%.o
clean:
rm -f prime.data $(TARGETS)
clean:
rm -f prime.data $(TARGETS)