1 |
jlec 10/02/03 21:35:05 |
2 |
|
3 |
Added: 0.8.1-Makefile.patch |
4 |
Log: |
5 |
Library providing a simple mechanism for accessing CBF files and imgCIF files. |
6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sci-libs/cbflib/files/0.8.1-Makefile.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.8.1-Makefile.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cbflib/files/0.8.1-Makefile.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: 0.8.1-Makefile.patch |
15 |
=================================================================== |
16 |
sed \ |
17 |
-e '/rm \*\.o/d' \ |
18 |
-e 's:$(CC) -o $@ \*\.o $(SOLDFLAGS):$(CC) $(LDFLAGS) -o $@ *.o:g' \ |
19 |
-e 's:$(F90C) -o $@ \*\.o $(SOLDFLAGS):$(F90C) $(LDFLAGS) -o $@ *.o:g' \ |
20 |
-e '900,2000s:$(CC) $(CFLAGS) :$(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \ |
21 |
-e '900,2000s:$(C++) $(CFLAGS) :$(C++) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \ |
22 |
-e '900,2000s:$(F90C) $(F90FLAGS) :$(F90C) $(F90FLAGS) $(SOCFLAGS) $(LDFLAGS) -o $@ :g' \ |
23 |
-e 's:-lcbf -lm -limg -o $@:-lcbf -lm -limg:g' \ |
24 |
-e 's:-lcbf -lm -o $@:-lcbf -lm:g' \ |
25 |
-e 's:-lfcb -o $@:-lfcb -lm:g' \ |
26 |
-e '900,2000s:-L$(LIB):-L$(SOLIB):g' \ |
27 |
-e 's|: $(LIB)/libcbf.a|: $(SOLIB)/libcbf.so|g' \ |
28 |
-e 's|: $(LIB)/libfcb.a|: $(SOLIB)/libfcb.so|g' \ |
29 |
-e 's:/usr/bin/bunzip2:/bin/bunzip2:g' \ |
30 |
-e 's:/usr/bin/bzip2:/bin/bunzip2:g' \ |
31 |
-e 's|install: all|install:|g' \ |
32 |
Makefile > Makefile.new |
33 |
--- Makefile 2009-07-18 17:24:25.000000000 +0200 |
34 |
+++ Makefile.new 2009-07-18 17:24:31.000000000 +0200 |
35 |
@@ -288,13 +288,13 @@ |
36 |
# |
37 |
# Program to use to decompress a data file |
38 |
# |
39 |
-DECOMPRESS = /usr/bin/bunzip2 |
40 |
+DECOMPRESS = /bin/bunzip2 |
41 |
|
42 |
|
43 |
# |
44 |
# Program to use to compress a data file |
45 |
# |
46 |
-COMPRESS = /usr/bin/bzip2 |
47 |
+COMPRESS = /bin/bunzip2 |
48 |
|
49 |
# |
50 |
# Program to use to generate a signature |
51 |
@@ -702,7 +702,7 @@ |
52 |
./.symlinks $(SLFLAGS) |
53 |
touch symlinksdone |
54 |
|
55 |
-install: all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/bin \ |
56 |
+install: $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/bin \ |
57 |
$(INSTALLDIR)/include $(INSTALLDIR)/include/cbflib |
58 |
-chmod -R 755 $(INSTALLDIR)/include/cbflib |
59 |
-chmod 755 $(INSTALLDIR)/lib/libcbf.a |
60 |
@@ -837,15 +837,13 @@ |
61 |
$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB) |
62 |
$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
63 |
$(AR) cr $@ *.o |
64 |
- rm *.o |
65 |
ifneq ($(RANLIB),) |
66 |
$(RANLIB) $@ |
67 |
endif |
68 |
|
69 |
$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
70 |
$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
71 |
- $(CC) -o $@ *.o $(SOLDFLAGS) |
72 |
- rm *.o |
73 |
+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOCFLAGS) $(SOLDFLAGS) -o $@ *.o -lgfortran |
74 |
|
75 |
# |
76 |
# IMG library |
77 |
@@ -853,15 +851,13 @@ |
78 |
$(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB) |
79 |
$(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
80 |
$(AR) cr $@ *.o |
81 |
- rm *.o |
82 |
ifneq ($(RANLIB),) |
83 |
$(RANLIB) $@ |
84 |
endif |
85 |
|
86 |
$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
87 |
$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
88 |
- $(CC) -o $@ *.o $(SOLDFLAGS) |
89 |
- rm *.o |
90 |
+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.0.8 $(SOLDFLAGS) -o $@ *.o |
91 |
|
92 |
# |
93 |
# CBF and IMG libraries |
94 |
@@ -876,7 +872,6 @@ |
95 |
ifneq ($(F90C),) |
96 |
$(F90C) $(F90FLAGS) -c $(F90SOURCE) |
97 |
$(AR) cr $@ *.o |
98 |
- rm *.o |
99 |
ifneq ($(RANLIB),) |
100 |
$(RANLIB) $@ |
101 |
endif |
102 |
@@ -887,8 +882,7 @@ |
103 |
$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
104 |
ifneq ($(F90C),) |
105 |
$(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
106 |
- $(F90C) -o $@ *.o $(SOLDFLAGS) |
107 |
- rm *.o |
108 |
+ $(F90C) $(LDFLAGS) -Wl,-soname,libcbf.so.0.8 $(SOLDFLAGS) -o $@ *.o |
109 |
else |
110 |
echo "Define F90C to build $(SOLIB)/libfcb.so" |
111 |
endif |
112 |
@@ -914,8 +908,8 @@ |
113 |
$(JAR) cf $@ org |
114 |
|
115 |
$(SOLIB)/libcbf_wrap.so: $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libimg.so |
116 |
- $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) $(JAVAINCLUDES) -c $(SRC)/cbf_wrap.c |
117 |
- $(CC) -o $@ *.o $(SOLDFLAGS) -L$(SOLIB) -lcbf |
118 |
+ $(CC) $(CFLAGS) $(SOCFLAGS) $(LDFLAGS) $(SOLDFLAGS) -o $@ $(SOCFLAGS) $(INCLUDES) $(WARNINGS) $(JAVAINCLUDES) -c $(SRC)/cbf_wrap.c |
119 |
+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf_wrap.so.0.8 $(SOLDFLAGS) -o $@ *.o -L$(SOLIB) -lcbf |
120 |
|
121 |
# |
122 |
# F90SOURCE |
123 |
@@ -942,131 +936,131 @@ |
124 |
# |
125 |
# convert_image example program |
126 |
# |
127 |
-$(BIN)/convert_image: $(LIB)/libcbf.a $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c \ |
128 |
+$(BIN)/convert_image: $(SOLIB)/libcbf.so $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c \ |
129 |
$(GOPTLIB) $(GOPTINC) |
130 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
131 |
- $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c $(GOPTLIB) -L$(LIB) \ |
132 |
- -lcbf -lm -o $@ |
133 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
134 |
+ $(EXAMPLES)/convert_image.c $(EXAMPLES)/img.c $(GOPTLIB) -L$(SOLIB) \ |
135 |
+ -lcbf -lm |
136 |
# |
137 |
# convert_minicbf example program |
138 |
# |
139 |
-$(BIN)/convert_minicbf: $(LIB)/libcbf.a $(EXAMPLES)/convert_minicbf.c \ |
140 |
+$(BIN)/convert_minicbf: $(SOLIB)/libcbf.so $(EXAMPLES)/convert_minicbf.c \ |
141 |
$(GOPTLIB) $(GOPTINC) |
142 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
143 |
- $(EXAMPLES)/convert_minicbf.c $(GOPTLIB) -L$(LIB) \ |
144 |
- -lcbf -lm -o $@ |
145 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
146 |
+ $(EXAMPLES)/convert_minicbf.c $(GOPTLIB) -L$(SOLIB) \ |
147 |
+ -lcbf -lm |
148 |
|
149 |
# |
150 |
# makecbf example program |
151 |
# |
152 |
-$(BIN)/makecbf: $(LIB)/libcbf.a $(EXAMPLES)/makecbf.c $(LIB)/libimg.a |
153 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
154 |
- $(EXAMPLES)/makecbf.c -L$(LIB) \ |
155 |
- -lcbf -lm -limg -o $@ |
156 |
+$(BIN)/makecbf: $(SOLIB)/libcbf.so $(EXAMPLES)/makecbf.c $(SOLIB)/libimg.so |
157 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
158 |
+ $(EXAMPLES)/makecbf.c -L$(SOLIB) \ |
159 |
+ -lcbf -lm -limg |
160 |
|
161 |
|
162 |
# |
163 |
# adscimg2cbf example program |
164 |
# |
165 |
-$(BIN)/adscimg2cbf: $(LIB)/libcbf.a $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c |
166 |
- $(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \ |
167 |
- $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c -L$(LIB) \ |
168 |
- -lcbf -lm -o $@ |
169 |
+$(BIN)/adscimg2cbf: $(SOLIB)/libcbf.so $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c |
170 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \ |
171 |
+ $(EXAMPLES)/adscimg2cbf.c $(EXAMPLES)/adscimg2cbf_sub.c -L$(SOLIB) \ |
172 |
+ -lcbf -lm |
173 |
|
174 |
# |
175 |
# cbf2adscimg example program |
176 |
# |
177 |
-$(BIN)/cbf2adscimg: $(LIB)/libcbf.a $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c |
178 |
- $(CC) $(CFLAGS) -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \ |
179 |
- $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c -L$(LIB) \ |
180 |
- -lcbf -lm -o $@ |
181 |
+$(BIN)/cbf2adscimg: $(SOLIB)/libcbf.so $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c |
182 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -D_SVID_SOURCE $(INCLUDES) $(WARNINGS) \ |
183 |
+ $(EXAMPLES)/cbf2adscimg.c $(EXAMPLES)/cbf2adscimg_sub.c -L$(SOLIB) \ |
184 |
+ -lcbf -lm |
185 |
|
186 |
# |
187 |
# img2cif example program |
188 |
# |
189 |
-$(BIN)/img2cif: $(LIB)/libcbf.a $(EXAMPLES)/img2cif.c $(LIB)/libimg.a \ |
190 |
+$(BIN)/img2cif: $(SOLIB)/libcbf.so $(EXAMPLES)/img2cif.c $(SOLIB)/libimg.so \ |
191 |
$(GOPTLIB) $(GOTPINC) |
192 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
193 |
- $(EXAMPLES)/img2cif.c $(GOPTLIB) -L$(LIB) \ |
194 |
- -lcbf -lm -limg -o $@ |
195 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
196 |
+ $(EXAMPLES)/img2cif.c $(GOPTLIB) -L$(SOLIB) \ |
197 |
+ -lcbf -lm -limg |
198 |
|
199 |
# |
200 |
# cif2cbf example program |
201 |
# |
202 |
-$(BIN)/cif2cbf: $(LIB)/libcbf.a $(EXAMPLES)/cif2cbf.c $(LIB)/libimg.a \ |
203 |
+$(BIN)/cif2cbf: $(SOLIB)/libcbf.so $(EXAMPLES)/cif2cbf.c $(SOLIB)/libimg.so \ |
204 |
$(GOPTLIB) $(GOPTINC) |
205 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
206 |
- $(EXAMPLES)/cif2cbf.c $(GOPTLIB) -L$(LIB) \ |
207 |
- -lcbf -lm -limg -o $@ |
208 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
209 |
+ $(EXAMPLES)/cif2cbf.c $(GOPTLIB) -L$(SOLIB) \ |
210 |
+ -lcbf -lm -limg |
211 |
# |
212 |
# testcell example program |
213 |
# |
214 |
-$(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C |
215 |
- $(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
216 |
- $(EXAMPLES)/testcell.C -L$(LIB) \ |
217 |
- -lcbf -lm -o $@ |
218 |
+$(BIN)/testcell: $(SOLIB)/libcbf.so $(EXAMPLES)/testcell.C |
219 |
+ $(C++) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
220 |
+ $(EXAMPLES)/testcell.C -L$(SOLIB) \ |
221 |
+ -lcbf -lm |
222 |
|
223 |
# |
224 |
# cif2c example program |
225 |
# |
226 |
-$(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c |
227 |
- $(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
228 |
- $(EXAMPLES)/cif2c.c -L$(LIB) \ |
229 |
- -lcbf -lm -o $@ |
230 |
+$(BIN)/cif2c: $(SOLIB)/libcbf.so $(EXAMPLES)/cif2c.c |
231 |
+ $(C++) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
232 |
+ $(EXAMPLES)/cif2c.c -L$(SOLIB) \ |
233 |
+ -lcbf -lm |
234 |
|
235 |
# |
236 |
# sauter_test example program |
237 |
# |
238 |
-$(BIN)/sauter_test: $(LIB)/libcbf.a $(EXAMPLES)/sauter_test.C |
239 |
- $(C++) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
240 |
- $(EXAMPLES)/sauter_test.C -L$(LIB) \ |
241 |
- -lcbf -lm -o $@ |
242 |
+$(BIN)/sauter_test: $(SOLIB)/libcbf.so $(EXAMPLES)/sauter_test.C |
243 |
+ $(C++) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
244 |
+ $(EXAMPLES)/sauter_test.C -L$(SOLIB) \ |
245 |
+ -lcbf -lm |
246 |
|
247 |
# |
248 |
# testreals example program |
249 |
# |
250 |
-$(BIN)/testreals: $(LIB)/libcbf.a $(EXAMPLES)/testreals.c |
251 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
252 |
- $(EXAMPLES)/testreals.c -L$(LIB) \ |
253 |
- -lcbf -lm -o $@ |
254 |
+$(BIN)/testreals: $(SOLIB)/libcbf.so $(EXAMPLES)/testreals.c |
255 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
256 |
+ $(EXAMPLES)/testreals.c -L$(SOLIB) \ |
257 |
+ -lcbf -lm |
258 |
# |
259 |
# testflat example program |
260 |
# |
261 |
-$(BIN)/testflat: $(LIB)/libcbf.a $(EXAMPLES)/testflat.c |
262 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
263 |
- $(EXAMPLES)/testflat.c -L$(LIB) \ |
264 |
- -lcbf -lm -o $@ |
265 |
+$(BIN)/testflat: $(SOLIB)/libcbf.so $(EXAMPLES)/testflat.c |
266 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
267 |
+ $(EXAMPLES)/testflat.c -L$(SOLIB) \ |
268 |
+ -lcbf -lm |
269 |
# |
270 |
# testflatpacked example program |
271 |
# |
272 |
-$(BIN)/testflatpacked: $(LIB)/libcbf.a $(EXAMPLES)/testflatpacked.c |
273 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
274 |
- $(EXAMPLES)/testflatpacked.c -L$(LIB) \ |
275 |
- -lcbf -lm -o $@ |
276 |
+$(BIN)/testflatpacked: $(SOLIB)/libcbf.so $(EXAMPLES)/testflatpacked.c |
277 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
278 |
+ $(EXAMPLES)/testflatpacked.c -L$(SOLIB) \ |
279 |
+ -lcbf -lm |
280 |
|
281 |
ifneq ($(F90C),) |
282 |
# |
283 |
# test_xds_binary example program |
284 |
# |
285 |
-$(BIN)/test_xds_binary: $(LIB)/libfcb.a $(EXAMPLES)/test_xds_binary.f90 |
286 |
- $(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \ |
287 |
- -L$(LIB) -lfcb -o $@ |
288 |
+$(BIN)/test_xds_binary: $(SOLIB)/libfcb.so $(EXAMPLES)/test_xds_binary.f90 |
289 |
+ $(F90C) $(F90FLAGS) $(LDFLAGS) -o $@ $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \ |
290 |
+ -L$(SOLIB) -lfcb -lm |
291 |
|
292 |
# |
293 |
# test_fcb_read_image example program |
294 |
# |
295 |
-$(BIN)/test_fcb_read_image: $(LIB)/libfcb.a $(EXAMPLES)/test_fcb_read_image.f90 |
296 |
- $(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \ |
297 |
- -L$(LIB) -lfcb -o $@ |
298 |
+$(BIN)/test_fcb_read_image: $(SOLIB)/libfcb.so $(EXAMPLES)/test_fcb_read_image.f90 |
299 |
+ $(F90C) $(F90FLAGS) $(LDFLAGS) -o $@ $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \ |
300 |
+ -L$(SOLIB) -lfcb -lm |
301 |
endif |
302 |
|
303 |
# |
304 |
# testcbf (C) |
305 |
# |
306 |
$(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a |
307 |
- $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) \ |
308 |
- $(EXAMPLES)/testcbf.c -L$(LIB) \ |
309 |
- -lcbf -lm -o $@ |
310 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(INCLUDES) $(WARNINGS) \ |
311 |
+ $(EXAMPLES)/testcbf.c -L$(SOLIB) \ |
312 |
+ -lcbf -lm |
313 |
|
314 |
# |
315 |
# testcbf (Java) |