blob: a60841b8ce08968cfe3dcfa5c092e84330708adb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
diff --git a/src/makefile b/src/makefile
index 3113471..dd7a320 100644
--- a/src/makefile
+++ b/src/makefile
@@ -176,47 +176,46 @@ nrutil.h:
# Executable files
$(BIN)/AquaWhat: AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)
- $(CC) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS) $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)
$(BIN)/AquaHow: AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)
- $(CC) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)
$(BIN)/AquaPseudo: AquaPseudo.o $(OBJECTS) $(R_OBJECTS)
- $(CC) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS) $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS)
$(BIN)/AquaDist: AquaDist.o $(OBJECTS)
- $(CC) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) $(LDFLAGS) -lm
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) -lm
$(BIN)/AquaCalc: AquaCalc.o $(OBJECTS) $(RNG_OBJECTS)
- $(CC) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) $(LDFLAGS) -lm
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) -lm
$(BIN)/AquaAssign: AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
- $(CC) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
$(BIN)/AquaCompl: AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
- $(CC) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS) -lm
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) -lm
$(BIN)/AquaRedun: AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
- $(CC) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
$(BIN)/testnew: testnew.o $(OBJECTS)
- $(CC) -o $(BIN)/testnew testnew.o $(OBJECTS) $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/testnew testnew.o $(OBJECTS)
$(BIN)/getproj: getproj.c
- $(CC) -o $(BIN)/getproj -O getproj.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN)/getproj getproj.c
$(BIN)/AquaPlot: AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
- $(CC) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
$(BIN)/Qext: Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
- $(CC) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
$(BIN)/StarTest: StarTest.o
- $(CC) -o $(BIN)/StarTest StarTest.o $(LDFLAGS) $(STARFLAGS) $(STARLIBS)
+ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/StarTest StarTest.o $(STARFLAGS) $(STARLIBS)
exth: exth.f
- f77 -o exth -O2 exth.f
- strip exth
+ $(FC) $(FFLAGS) $(LDFLAGS) -o exth -O2 exth.f
# Object files
@@ -269,7 +268,7 @@ AquaCommon.o: AquaCommon.c AquaCommon.h nrutil.h \
$(CC) -c AquaCommon.c $(CFLAGS)
nrutil.o: nrutil.c nrutil.h
- $(CC) -c nrutil.c -DANSI
+ $(CC) $(CFLAGS) -c nrutil.c -DANSI
AquaFuncts.o: AquaFuncts.c AquaFuncts.h AquaFuncts_cv.h AquaFuncts_io.h\
AquaStrucset.h AquaFiles.h\
@@ -319,7 +318,7 @@ $(LIB)/MenuFuncts.o: $(LIB)/MenuFuncts.c $(LIB)/MenuTypes.h $(LIB)/MenuFuncts.h\
cd $(LIB); $(CC) -c MenuFuncts.c $(CFLAGS)
cv_subs.o: cv_subs.f
- f77 -c cv_subs.f $(FFLAGS)
+ $(FC) -c cv_subs.f $(FFLAGS)
Qext.o: Qext.c Qext.h\
$(LIB)/MenuFuncts.h $(LIB)/Functs.h $(G_HEADERS)
|
GitWeb