[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/aqua/, sci-chemistry/aqua/files/ - gentoo-commits

From:	Justin Lecher <jlec@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/aqua/, sci-chemistry/aqua/files/
Date:	Fri, 14 Apr 2017 11:56:12
Message-Id:	`1492170966.c1314750e65936721d22e9adf8bbda10a3099e62.jlec@gentoo`

1

commit:     c1314750e65936721d22e9adf8bbda10a3099e62

2

Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>

3

AuthorDate: Fri Apr 14 11:41:10 2017 +0000

4

Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>

5

CommitDate: Fri Apr 14 11:56:06 2017 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1314750

7

8

sci-chemistry/aqua: QA fixes and EAPI bump

9

10

* Bump to EAPI 6

11

* Respect CFLAGS

12

* Add missing build dep

13

* Generate missing checksums

14

15

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=614230

16

Package-Manager: Portage-2.3.5, Repoman-2.3.2

17

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

18

19

 sci-chemistry/aqua/Manifest                        |  2 +-

20

 .../{aqua-3.2-r2.ebuild => aqua-3.2-r3.ebuild}     | 17 ++++++++------

21

 .../{3.2-flags.patch => aqua-3.2-flags.patch}      | 26 +++++++++++-----------

22

 3 files changed, 24 insertions(+), 21 deletions(-)

23

24

diff --git a/sci-chemistry/aqua/Manifest b/sci-chemistry/aqua/Manifest

25

index 187beb2cef9..84673718e67 100644

26

--- a/sci-chemistry/aqua/Manifest

27

+++ b/sci-chemistry/aqua/Manifest

28

@@ -1,2 +1,2 @@

29

-DIST aqua-3.2-nmr_manual.tar.gz 632031 SHA256 89bbc2501831e547fec2fe755bbc0081f672e5e2c7adb83618699e6825f73996

30

+DIST aqua-3.2-nmr_manual.tar.gz 632031 SHA256 89bbc2501831e547fec2fe755bbc0081f672e5e2c7adb83618699e6825f73996 SHA512 9b125b03507afebf15301c893efffae9be4e9695b9c577e5c2a80e83b620d04b4c27e867adf06336afa1556eddc96aa97de936028e503b1e85e156542664da0f WHIRLPOOL 181d320edd32faaac71a48163975ab6899221d7c85744eedfb8954d3360c974a0c8223b8b0f00375e2369fa7350df2e16a1062698be01c625ef00308a8ee0887

31

 DIST aqua3.2.tar.gz 688408 SHA256 895291b1771f4db5b4a010ce797400a8c4d84095bf34d660dd3405223419242f SHA512 1939f662a68122da613368aa106d7a31525903014420035eba9d10c3bd99b04d654d156328d308673003854233a02c1da48c036f3187fa1f0f303cc5928edd6a WHIRLPOOL 458fc0e574273fd9d2647ef8b2788c98669c9f96133f7132eddc9cbfb981e42894f5e4fd0e8d67f52ddb4c6424399b21973d4d87a175b440d81b7b955fe3fe41

32

33

diff --git a/sci-chemistry/aqua/aqua-3.2-r2.ebuild b/sci-chemistry/aqua/aqua-3.2-r3.ebuild

34

similarity index 91%

35

rename from sci-chemistry/aqua/aqua-3.2-r2.ebuild

36

rename to sci-chemistry/aqua/aqua-3.2-r3.ebuild

37

index 335e6885040..74e4e60416f 100644

38

--- a/sci-chemistry/aqua/aqua-3.2-r2.ebuild

39

+++ b/sci-chemistry/aqua/aqua-3.2-r3.ebuild

40

@@ -1,9 +1,9 @@

41

-# Copyright 1999-2012 Gentoo Foundation

42

+# Copyright 1999-2017 Gentoo Foundation

43

 # Distributed under the terms of the GNU General Public License v2

44

45

-EAPI=4

46

+EAPI=6

47

48

-inherit eutils fortran-2 toolchain-funcs

49

+inherit fortran-2 toolchain-funcs

50

51

 DESCRIPTION="Program suite in this distribution calculates restraint violations"

52

 HOMEPAGE="http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html"

53

@@ -17,12 +17,16 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

54

 IUSE="doc examples"

55

56

 RDEPEND="sci-chemistry/procheck"

57

-DEPEND=""

58

+DEPEND="app-shells/tcsh"

59

60

 RESTRICT="fetch"

61

62

 S="${WORKDIR}"/${PN}${PV}

63

64

+PATCHES=(

65

+	"${FILESDIR}"/${P}-flags.patch

66

+)

67

+

68

 pkg_nofetch() {

69

 	elog "Please visit http://www.ebi.ac.uk/thornton-srv/software/PROCHECK/download.html"

70

 	elog "And follow the instruction for downloading ${PN}${PV}.tar.gz ->  ${DISTDIR}/${PN}${PV}.tar.gz."

71

@@ -37,11 +41,11 @@ src_prepare() {

72

 		-e "s:/bin/gawk:${EPREFIX}/usr/bin/gawk:g" \

73

 		-e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \

74

 		-i $(find . -type f) || die

75

-	epatch "${FILESDIR}"/${PV}-flags.patch

76

+	default

77

}

78

79

 src_compile() {

80

-	pushd src > /dev/null

81

+	cd src || die

82

 	emake \

83

 		MYROOT="${WORKDIR}" \

84

 		CC="$(tc-getCC)" \

85

@@ -57,7 +61,6 @@ src_compile() {

86

 		CFLAGS="${CFLAGS} -I../sub/lib" \

87

 		FFLAGS="${FFLAGS}" \

88

 		LDFLAGS="${LDFLAGS}"

89

-	popd

90

}

91

92

 src_install() {

93

94

diff --git a/sci-chemistry/aqua/files/3.2-flags.patch b/sci-chemistry/aqua/files/aqua-3.2-flags.patch

95

similarity index 70%

96

rename from sci-chemistry/aqua/files/3.2-flags.patch

97

rename to sci-chemistry/aqua/files/aqua-3.2-flags.patch

98

index cd12fbb9a32..a60841b8ce0 100644

99

--- a/sci-chemistry/aqua/files/3.2-flags.patch

100

+++ b/sci-chemistry/aqua/files/aqua-3.2-flags.patch

101

@@ -7,39 +7,39 @@ index 3113471..dd7a320 100644

102

103

  $(BIN)/AquaWhat:    AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)

104

 -	$(CC) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS) $(LDFLAGS)

105

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)

106

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)

107

108

  $(BIN)/AquaHow:	    AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)

109

 -	$(CC) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)

110

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)

111

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)

112

113

  $(BIN)/AquaPseudo:  AquaPseudo.o $(OBJECTS) $(R_OBJECTS) 

114

 -	$(CC) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS) $(LDFLAGS)

115

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS)

116

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS)

117

118

  $(BIN)/AquaDist:    AquaDist.o $(OBJECTS) 

119

 -	$(CC) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) $(LDFLAGS) -lm

120

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) -lm

121

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) -lm

122

123

  $(BIN)/AquaCalc:    AquaCalc.o $(OBJECTS) $(RNG_OBJECTS)

124

 -	$(CC) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) $(LDFLAGS) -lm

125

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) -lm

126

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) -lm

127

128

  $(BIN)/AquaAssign:  AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)

129

 -	$(CC) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)

130

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)

131

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)

132

133

  $(BIN)/AquaCompl:  AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) 

134

 -	$(CC) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS) -lm  

135

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) -lm  

136

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) -lm

137

138

  $(BIN)/AquaRedun:  AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) 

139

 -	$(CC) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)

140

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)

141

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)

142

143

  $(BIN)/testnew:	    testnew.o $(OBJECTS)

144

 -	$(CC) -o $(BIN)/testnew testnew.o $(OBJECTS) $(LDFLAGS)

145

-+	$(CC) $(LDFLAGS) -o $(BIN)/testnew testnew.o $(OBJECTS)

146

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/testnew testnew.o $(OBJECTS)

147

148

  $(BIN)/getproj:    getproj.c 

149

 -	$(CC) -o $(BIN)/getproj -O getproj.c

150

@@ -47,20 +47,20 @@ index 3113471..dd7a320 100644

151

152

  $(BIN)/AquaPlot:    AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o

153

 -	$(CC) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS)

154

-+	$(CC) $(LDFLAGS) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o

155

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o

156

157

  $(BIN)/Qext:	   Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o

158

 -	$(CC) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS)

159

-+	$(CC) $(LDFLAGS) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o

160

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o

161

162

  $(BIN)/StarTest:	StarTest.o

163

 -	$(CC) -o $(BIN)/StarTest StarTest.o $(LDFLAGS) $(STARFLAGS) $(STARLIBS)

164

-+	$(CC) $(LDFLAGS) -o $(BIN)/StarTest StarTest.o $(STARFLAGS) $(STARLIBS)

165

++	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/StarTest StarTest.o $(STARFLAGS) $(STARLIBS)

166

167

  exth:		exth.f

168

 -	f77 -o exth -O2 exth.f

169

 -	strip exth

170

-+	$(FC) $(FFLAGS) -o exth -O2 exth.f

171

++	$(FC) $(FFLAGS) $(LDFLAGS) -o exth -O2 exth.f

172

173

174

  # Object files

1	commit: c1314750e65936721d22e9adf8bbda10a3099e62
2	Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3	AuthorDate: Fri Apr 14 11:41:10 2017 +0000
4	Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5	CommitDate: Fri Apr 14 11:56:06 2017 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1314750
7
8	sci-chemistry/aqua: QA fixes and EAPI bump
9
10	* Bump to EAPI 6
11	* Respect CFLAGS
12	* Add missing build dep
13	* Generate missing checksums
14
15	Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=614230
16	Package-Manager: Portage-2.3.5, Repoman-2.3.2
17	Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
18
19	sci-chemistry/aqua/Manifest \| 2 +-
20	.../{aqua-3.2-r2.ebuild => aqua-3.2-r3.ebuild} \| 17 ++++++++------
21	.../{3.2-flags.patch => aqua-3.2-flags.patch} \| 26 +++++++++++-----------
22	3 files changed, 24 insertions(+), 21 deletions(-)
23
24	diff --git a/sci-chemistry/aqua/Manifest b/sci-chemistry/aqua/Manifest
25	index 187beb2cef9..84673718e67 100644
26	--- a/sci-chemistry/aqua/Manifest
27	+++ b/sci-chemistry/aqua/Manifest
28	@@ -1,2 +1,2 @@
29	-DIST aqua-3.2-nmr_manual.tar.gz 632031 SHA256 89bbc2501831e547fec2fe755bbc0081f672e5e2c7adb83618699e6825f73996
30	+DIST aqua-3.2-nmr_manual.tar.gz 632031 SHA256 89bbc2501831e547fec2fe755bbc0081f672e5e2c7adb83618699e6825f73996 SHA512 9b125b03507afebf15301c893efffae9be4e9695b9c577e5c2a80e83b620d04b4c27e867adf06336afa1556eddc96aa97de936028e503b1e85e156542664da0f WHIRLPOOL 181d320edd32faaac71a48163975ab6899221d7c85744eedfb8954d3360c974a0c8223b8b0f00375e2369fa7350df2e16a1062698be01c625ef00308a8ee0887
31	DIST aqua3.2.tar.gz 688408 SHA256 895291b1771f4db5b4a010ce797400a8c4d84095bf34d660dd3405223419242f SHA512 1939f662a68122da613368aa106d7a31525903014420035eba9d10c3bd99b04d654d156328d308673003854233a02c1da48c036f3187fa1f0f303cc5928edd6a WHIRLPOOL 458fc0e574273fd9d2647ef8b2788c98669c9f96133f7132eddc9cbfb981e42894f5e4fd0e8d67f52ddb4c6424399b21973d4d87a175b440d81b7b955fe3fe41
32
33	diff --git a/sci-chemistry/aqua/aqua-3.2-r2.ebuild b/sci-chemistry/aqua/aqua-3.2-r3.ebuild
34	similarity index 91%
35	rename from sci-chemistry/aqua/aqua-3.2-r2.ebuild
36	rename to sci-chemistry/aqua/aqua-3.2-r3.ebuild
37	index 335e6885040..74e4e60416f 100644
38	--- a/sci-chemistry/aqua/aqua-3.2-r2.ebuild
39	+++ b/sci-chemistry/aqua/aqua-3.2-r3.ebuild
40	@@ -1,9 +1,9 @@
41	-# Copyright 1999-2012 Gentoo Foundation
42	+# Copyright 1999-2017 Gentoo Foundation
43	# Distributed under the terms of the GNU General Public License v2
44
45	-EAPI=4
46	+EAPI=6
47
48	-inherit eutils fortran-2 toolchain-funcs
49	+inherit fortran-2 toolchain-funcs
50
51	DESCRIPTION="Program suite in this distribution calculates restraint violations"
52	HOMEPAGE="http://www.biochem.ucl.ac.uk/~roman/procheck/procheck.html"
53	@@ -17,12 +17,16 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
54	IUSE="doc examples"
55
56	RDEPEND="sci-chemistry/procheck"
57	-DEPEND=""
58	+DEPEND="app-shells/tcsh"
59
60	RESTRICT="fetch"
61
62	S="${WORKDIR}"/${PN}${PV}
63
64	+PATCHES=(
65	+ "${FILESDIR}"/${P}-flags.patch
66	+)
67	+
68	pkg_nofetch() {
69	elog "Please visit http://www.ebi.ac.uk/thornton-srv/software/PROCHECK/download.html"
70	elog "And follow the instruction for downloading ${PN}${PV}.tar.gz -> ${DISTDIR}/${PN}${PV}.tar.gz."
71	@@ -37,11 +41,11 @@ src_prepare() {
72	-e "s:/bin/gawk:${EPREFIX}/usr/bin/gawk:g" \
73	-e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
74	-i $(find . -type f) \|\| die
75	- epatch "${FILESDIR}"/${PV}-flags.patch
76	+ default
77	}
78
79	src_compile() {
80	- pushd src > /dev/null
81	+ cd src \|\| die
82	emake \
83	MYROOT="${WORKDIR}" \
84	CC="$(tc-getCC)" \
85	@@ -57,7 +61,6 @@ src_compile() {
86	CFLAGS="${CFLAGS} -I../sub/lib" \
87	FFLAGS="${FFLAGS}" \
88	LDFLAGS="${LDFLAGS}"
89	- popd
90	}
91
92	src_install() {
93
94	diff --git a/sci-chemistry/aqua/files/3.2-flags.patch b/sci-chemistry/aqua/files/aqua-3.2-flags.patch
95	similarity index 70%
96	rename from sci-chemistry/aqua/files/3.2-flags.patch
97	rename to sci-chemistry/aqua/files/aqua-3.2-flags.patch
98	index cd12fbb9a32..a60841b8ce0 100644
99	--- a/sci-chemistry/aqua/files/3.2-flags.patch
100	+++ b/sci-chemistry/aqua/files/aqua-3.2-flags.patch
101	@@ -7,39 +7,39 @@ index 3113471..dd7a320 100644
102
103	$(BIN)/AquaWhat: AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)
104	- $(CC) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS) $(LDFLAGS)
105	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)
106	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS)
107
108	$(BIN)/AquaHow: AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)
109	- $(CC) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)
110	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)
111	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS)
112
113	$(BIN)/AquaPseudo: AquaPseudo.o $(OBJECTS) $(R_OBJECTS)
114	- $(CC) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS) $(LDFLAGS)
115	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS)
116	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS)
117
118	$(BIN)/AquaDist: AquaDist.o $(OBJECTS)
119	- $(CC) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) $(LDFLAGS) -lm
120	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) -lm
121	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) -lm
122
123	$(BIN)/AquaCalc: AquaCalc.o $(OBJECTS) $(RNG_OBJECTS)
124	- $(CC) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) $(LDFLAGS) -lm
125	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) -lm
126	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) -lm
127
128	$(BIN)/AquaAssign: AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
129	- $(CC) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)
130	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
131	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
132
133	$(BIN)/AquaCompl: AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
134	- $(CC) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS) -lm
135	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) -lm
136	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) -lm
137
138	$(BIN)/AquaRedun: AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
139	- $(CC) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS)
140	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
141	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS)
142
143	$(BIN)/testnew: testnew.o $(OBJECTS)
144	- $(CC) -o $(BIN)/testnew testnew.o $(OBJECTS) $(LDFLAGS)
145	-+ $(CC) $(LDFLAGS) -o $(BIN)/testnew testnew.o $(OBJECTS)
146	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/testnew testnew.o $(OBJECTS)
147
148	$(BIN)/getproj: getproj.c
149	- $(CC) -o $(BIN)/getproj -O getproj.c
150	@@ -47,20 +47,20 @@ index 3113471..dd7a320 100644
151
152	$(BIN)/AquaPlot: AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
153	- $(CC) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS)
154	-+ $(CC) $(LDFLAGS) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
155	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
156
157	$(BIN)/Qext: Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
158	- $(CC) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS)
159	-+ $(CC) $(LDFLAGS) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
160	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o
161
162	$(BIN)/StarTest: StarTest.o
163	- $(CC) -o $(BIN)/StarTest StarTest.o $(LDFLAGS) $(STARFLAGS) $(STARLIBS)
164	-+ $(CC) $(LDFLAGS) -o $(BIN)/StarTest StarTest.o $(STARFLAGS) $(STARLIBS)
165	++ $(CC) $(LDFLAGS) $(CFLAGS) -o $(BIN)/StarTest StarTest.o $(STARFLAGS) $(STARLIBS)
166
167	exth: exth.f
168	- f77 -o exth -O2 exth.f
169	- strip exth
170	-+ $(FC) $(FFLAGS) -o exth -O2 exth.f
171	++ $(FC) $(FFLAGS) $(LDFLAGS) -o exth -O2 exth.f
172
173
174	# Object files

Gentoo Archives: gentoo-commits