1 |
jlec 13/11/28 07:57:07 |
2 |
|
3 |
Added: xyza2pipe-20121001-gentoo.patch |
4 |
Log: |
5 |
sci-chemistry/xyza2pipe: Version Bump |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-chemistry/xyza2pipe/files/xyza2pipe-20121001-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/xyza2pipe/files/xyza2pipe-20121001-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/xyza2pipe/files/xyza2pipe-20121001-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: xyza2pipe-20121001-gentoo.patch |
16 |
=================================================================== |
17 |
Makefile | 106 +++++++++++++++++++++++++++++++++++++-------------------------- |
18 |
1 file changed, 63 insertions(+), 43 deletions(-) |
19 |
|
20 |
diff --git a/Makefile b/Makefile |
21 |
index 15d4bd3..e738ec2 100644 |
22 |
--- a/Makefile |
23 |
+++ b/Makefile |
24 |
@@ -4,7 +4,7 @@ |
25 |
# Last modified: Feb/22/2012 |
26 |
# |
27 |
|
28 |
-CFLAGS = -O3 |
29 |
+CFLAGS ?= -O3 |
30 |
MFLAGS = -lm |
31 |
|
32 |
TARGETS = xyza2pipe ucsf2pipe nv2pipe xeasy2pipe azara2pipe vnmr2pipe xwnmr2pipe\ |
33 |
@@ -62,89 +62,109 @@ clean: |
34 |
rm -f $(TARGETS) addxyza2pipe |
35 |
|
36 |
$(OBJECTS_MATH): |
37 |
- $(CC) $*.c -c -o $@ $(CFLAGS) -D__XYZA2PIPE__ |
38 |
+ $(CC) $(CPPFLAGS) -D__XYZA2PIPE__ $(CFLAGS) $*.c -c -o $@ |
39 |
|
40 |
.o: |
41 |
- $(CC) $< -c -o $@ $(CFLAGS) |
42 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) $< -c -o $@ |
43 |
|
44 |
xyza2pipe: $(OBJECTS_C) $(OBJECTS_XP) |
45 |
- $(CC) $@.c $^ -o $@ \ |
46 |
- $(CFLAGS) $(MFLAGS) |
47 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
48 |
+ $(MFLAGS) |
49 |
+ mv -v $@ bin/ |
50 |
|
51 |
pipe2xyza: $(OBJECTS_C) $(OBJECTS_PX) |
52 |
- $(CC) $@.c $^ -o $@ \ |
53 |
- $(CFLAGS) $(MFLAGS) |
54 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
55 |
+ $(MFLAGS) |
56 |
+ mv -v $@ bin/ |
57 |
|
58 |
ucsf2pipe: $(OBJECTS_C) $(OBJECTS_UP) |
59 |
- $(CC) $@.c $^ -o $@ \ |
60 |
- $(CFLAGS) $(MFLAGS) |
61 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
62 |
+ $(MFLAGS) |
63 |
+ mv -v $@ bin/ |
64 |
|
65 |
pipe2ucsf: $(OBJECTS_C) $(OBJECTS_PU) |
66 |
- $(CC) $@.c $^ -o $@ \ |
67 |
- $(CFLAGS) $(MFLAGS) |
68 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
69 |
+ $(MFLAGS) |
70 |
+ mv -v $@ bin/ |
71 |
|
72 |
nv2pipe: $(OBJECTS_C) $(OBJECTS_NP) |
73 |
- $(CC) $@.c $^ -o $@ \ |
74 |
- $(CFLAGS) $(MFLAGS) |
75 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
76 |
+ $(MFLAGS) |
77 |
+ mv -v $@ bin/ |
78 |
|
79 |
pipe2nv: $(OBJECTS_C) $(OBJECTS_PN) |
80 |
- $(CC) $@.c $^ -o $@ \ |
81 |
- $(CFLAGS) $(MFLAGS) |
82 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
83 |
+ $(MFLAGS) |
84 |
+ mv -v $@ bin/ |
85 |
|
86 |
xeasy2pipe: $(OBJECTS_C) $(OBJECTS_EP) |
87 |
- $(CC) $@.c $^ -o $@ \ |
88 |
- $(CFLAGS) $(MFLAGS) |
89 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
90 |
+ $(MFLAGS) |
91 |
+ mv -v $@ bin/ |
92 |
|
93 |
pipe2xeasy: $(OBJECTS_C) $(OBJECTS_PE) |
94 |
- $(CC) $@.c $^ -o $@ \ |
95 |
- $(CFLAGS) $(MFLAGS) |
96 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
97 |
+ $(MFLAGS) |
98 |
+ mv -v $@ bin/ |
99 |
|
100 |
azara2pipe: $(OBJECTS_C) $(OBJECTS_AP) |
101 |
- $(CC) $@.c $^ -o $@ \ |
102 |
- $(CFLAGS) $(MFLAGS) |
103 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
104 |
+ $(MFLAGS) |
105 |
+ mv -v $@ bin/ |
106 |
|
107 |
pipe2azara: $(OBJECTS_C) $(OBJECTS_PA) |
108 |
- $(CC) $@.c $^ -o $@ \ |
109 |
- $(CFLAGS) $(MFLAGS) |
110 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
111 |
+ $(MFLAGS) |
112 |
+ mv -v $@ bin/ |
113 |
|
114 |
vnmr2pipe: $(OBJECTS_C) $(OBJECTS_VP) |
115 |
- $(CC) $@.c $^ -o $@ \ |
116 |
- $(CFLAGS) $(MFLAGS) |
117 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
118 |
+ $(MFLAGS) |
119 |
+ mv -v $@ bin/ |
120 |
|
121 |
xwnmr2pipe: $(OBJECTS_C) $(OBJECTS_BP) |
122 |
- $(CC) $@.c $^ -o $@ \ |
123 |
- $(CFLAGS) $(MFLAGS) |
124 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
125 |
+ $(MFLAGS) |
126 |
+ mv -v $@ bin/ |
127 |
|
128 |
pipe2proj: $(OBJECTS_C) $(OBJECTS_PJ) |
129 |
- $(CC) $@.c $^ -o $@ \ |
130 |
- $(CFLAGS) $(MFLAGS) |
131 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
132 |
+ $(MFLAGS) |
133 |
+ mv -v $@ bin/ |
134 |
|
135 |
add2pipe: $(OBJECTS_C) $(OBJECTS_DXP) |
136 |
- $(CC) $@.c $^ -o $@ \ |
137 |
- $(CFLAGS) $(MFLAGS) |
138 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
139 |
+ $(MFLAGS) |
140 |
+ mv -v $@ bin/ |
141 |
rm -f addxyza2pipe |
142 |
ln -s add2pipe addxyza2pipe |
143 |
|
144 |
adducsf2pipe: $(OBJECTS_C) $(OBJECTS_DUP) |
145 |
- $(CC) $@.c $^ -o $@ \ |
146 |
- $(CFLAGS) $(MFLAGS) |
147 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
148 |
+ $(MFLAGS) |
149 |
+ mv -v $@ bin/ |
150 |
|
151 |
addnv2pipe: $(OBJECTS_C) $(OBJECTS_DNP) |
152 |
- $(CC) $@.c $^ -o $@ \ |
153 |
- $(CFLAGS) $(MFLAGS) |
154 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
155 |
+ $(MFLAGS) |
156 |
+ mv -v $@ bin/ |
157 |
|
158 |
addxeasy2pipe: $(OBJECTS_C) $(OBJECTS_DEP) |
159 |
- $(CC) $@.c $^ -o $@ \ |
160 |
- $(CFLAGS) $(MFLAGS) |
161 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
162 |
+ $(MFLAGS) |
163 |
+ mv -v $@ bin/ |
164 |
|
165 |
addazara2pipe: $(OBJECTS_C) $(OBJECTS_DAP) |
166 |
- $(CC) $@.c $^ -o $@ \ |
167 |
- $(CFLAGS) $(MFLAGS) |
168 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
169 |
+ $(MFLAGS) |
170 |
+ mv -v $@ bin/ |
171 |
|
172 |
addvnmr2pipe: $(OBJECTS_C) $(OBJECTS_DVP) |
173 |
- $(CC) $@.c $^ -o $@ \ |
174 |
- $(CFLAGS) $(MFLAGS) |
175 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
176 |
+ $(MFLAGS) |
177 |
+ mv -v $@ bin/ |
178 |
|
179 |
addxwnmr2pipe: $(OBJECTS_C) $(OBJECTS_DBP) |
180 |
- $(CC) $@.c $^ -o $@ \ |
181 |
- $(CFLAGS) $(MFLAGS) |
182 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \ |
183 |
+ $(MFLAGS) |
184 |
+ mv -v $@ bin/ |