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
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
|
Makefile_LINUX_gcc42 | 93 ++++++++++++++++++++++++++++------------------------
1 file changed, 50 insertions(+), 43 deletions(-)
diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42
index 0aa639a..071863d 100644
--- a/Makefile_LINUX_gcc42
+++ b/Makefile_LINUX_gcc42
@@ -250,7 +250,11 @@
# Version string
-VERSION = 0.9.2
+MAJOR = 0
+MINOR = 9
+MICRO = 3
+VERSION = ${MAJOR}.${MINOR}.${MICRO}
+
#
@@ -297,12 +301,12 @@ SHAR = /usr/bin/shar
#
# Program to use to create archives
#
-AR = /usr/bin/ar
+AR ?= ar
#
# Program to use to add an index to an archive
#
-RANLIB = /usr/bin/ranlib
+RANLIB ?= ranlib
#
# Program to use to decompress a data file
@@ -313,7 +317,7 @@ DECOMPRESS = bunzip2
#
# Program to use to compress a data file
#
-COMPRESS = /usr/bin/bzip2
+COMPRESS = bzip2
#
# Program to use to generate a signature
@@ -410,12 +414,12 @@ SETUP_PY = setup.py
# with gcc version 4.2
#
#########################################################
-CC = gcc
-C++ = g++
-CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing
-F90C = gfortran
-F90FLAGS = -g -fno-range-check
-F90LDFLAGS =
+CC ?= gcc
+CXX ?= g++
+CFLAGS += -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing
+FC ?= gfortran
+FCFLAGS += -g -fno-range-check
+LDFLAGS +=
SOCFLAGS = -fPIC
SOLDFLAGS = -shared -Wl,-rpath,$(INSTALLDIR)/lib
JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux
@@ -425,7 +429,7 @@ M4FLAGS = -Dfcb_bytes_in_rec=131072
TIME = time
ifneq ($(NOFORTRAN),)
-F90C =
+FC =
endif
#
@@ -491,9 +495,9 @@ RTLPEXPORTS = export LD_LIBRARY_PATH=$(PWD)/solib:$(PWD)/lib;\
.m4.f90:
m4 -P $(M4FLAGS) $< > $@
-ifneq ($(F90C),)
+ifneq ($(FC),)
.f90.o:
- $(F90C) $(F90FLAGS) -c $< -o $@
+ $(FC) $(FCFLAGS) -c $< -o $@
endif
@@ -701,7 +705,7 @@ default:
#
# Compile the library and examples
#
-all:: $(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) $(HDF5)\
+all:: $(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) \
symlinksdone \
$(REGEXDEP) \
$(LIB)/libcbf.a \
@@ -725,12 +729,12 @@ all:: $(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) $(HDF5)\
$(BIN)/tiff2cbf
-ifneq ($(F90C),)
+ifneq ($(FC),)
all:: $(BIN)/test_xds_binary \
$(BIN)/test_fcb_read_image
endif
-shared: $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so
+shared: $(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION}
javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
@@ -969,7 +973,7 @@ $(SRC)/cbf_stx.c: $(SRC)/cbf.stx.y
#
# CBF library
#
-$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB) $(HDF5)
+$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB)
$(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
$(AR) cr $@ *.o
mv *.o $(LIB)
@@ -977,10 +981,11 @@ ifneq ($(RANLIB),)
$(RANLIB) $@
endif
-$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) $(HDF5)
- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
- $(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS) $(HDF5SOLIBS)
- rm *.o
+$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE)
+ mv *.o $(SOLIB)
+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS) $(HDF5SOLIBS)
+ ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so
#
# IMG library
@@ -993,9 +998,10 @@ ifneq ($(RANLIB),)
endif
rm img.o
-$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
- $(CC) -o $@ img.o $(SOLDFLAGS)
+$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c
+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o -lm
+ ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so
rm img.o
#
@@ -1007,25 +1013,26 @@ CBF_IMG_LIBS: $(LIB)/libcbf.a $(LIB)/libimg.a
#
# FCB library
#
-$(LIB)/libfcb.a: $(F90SOURCE) $(COMMONDEP) $(LIB) $(HDF5)
-ifneq ($(F90C),)
- $(F90C) $(F90FLAGS) -c $(F90SOURCE)
+$(LIB)/libfcb.a: $(F90SOURCE) $(COMMONDEP) $(LIB)
+ifneq ($(FC),)
+ $(FC) $(FCFLAGS) -c $(F90SOURCE)
$(AR) cr $@ *.o
ifneq ($(RANLIB),)
$(RANLIB) $@
endif
rm *.o
else
- echo "Define F90C to build $(LIB)/libfcb.a"
+ echo "Define FC to build $(LIB)/libfcb.a"
endif
-$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
-ifneq ($(F90C),)
- $(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
- $(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS)
+$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB)
+ifneq ($(FC),)
+ $(FC) $(FCFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE)
+ $(FC) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(FCFLAGS) -o $@ *.o
+ ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so
rm *.o
else
- echo "Define F90C to build $(SOLIB)/libfcb.so"
+ echo "Define FC to build $(SOLIB)/libfcb.so"
endif
@@ -1183,7 +1190,7 @@ $(BIN)/cbf_template_t: $(DECTRIS_EXAMPLES)/cbf_template_t.c \
# testcell example program
#
$(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C
- $(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
+ $(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
$(EXAMPLES)/testcell.C -L$(LIB) \
-lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
@@ -1191,7 +1198,7 @@ $(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C
# cif2c example program
#
$(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c
- $(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
+ $(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
$(EXAMPLES)/cif2c.c -L$(LIB) \
-lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
@@ -1199,7 +1206,7 @@ $(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c
# sauter_test example program
#
$(BIN)/sauter_test: $(LIB)/libcbf.a $(EXAMPLES)/sauter_test.C
- $(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
+ $(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \
$(EXAMPLES)/sauter_test.C -L$(LIB) \
-lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
@@ -1253,19 +1260,19 @@ $(BIN)/testflatpacked: $(LIB)/libcbf.a $(EXAMPLES)/testflatpacked.c
$(EXAMPLES)/testflatpacked.c -L$(LIB) \
-lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@
-ifneq ($(F90C),)
+ifneq ($(FC),)
#
# test_xds_binary example program
#
$(BIN)/test_xds_binary: $(LIB)/libfcb.a $(EXAMPLES)/test_xds_binary.f90
- $(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \
+ $(FC) $(FCFLAGS) $(LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \
-L$(LIB) -lfcb -o $@
#
# test_fcb_read_image example program
#
$(BIN)/test_fcb_read_image: $(LIB)/libfcb.a $(EXAMPLES)/test_fcb_read_image.f90
- $(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \
+ $(FC) $(FCFLAGS) $(LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \
-L$(LIB) -lfcb -o $@
endif
@@ -1520,7 +1527,7 @@ basic: $(BIN)/makecbf $(BIN)/img2cif $(BIN)/cif2cbf $(TESTINPUT_BASIC)
#
# Extra Tests
#
-ifneq ($(F90C),)
+ifneq ($(FC),)
extra: $(BIN)/convert_image $(BIN)/convert_minicbf $(BIN)/cif2cbf $(BIN)/testcell \
$(BIN)/testreals $(BIN)/testflat $(BIN)/testflatpacked \
$(BIN)/test_xds_binary $(BIN)/test_fcb_read_image $(BIN)/convert_minicbf \
@@ -1582,7 +1589,7 @@ endif
-cmp testflatin.cbf testflatout.cbf
$(TIME) $(BIN)/testflatpacked
-cmp testflatpackedin.cbf testflatpackedout.cbf
-ifneq ($(F90C),)
+ifneq ($(FC),)
echo testflatout.cbf | $(TIME) $(BIN)/test_xds_binary > test_xds_bin_testflatout.out
-$(DIFF) test_xds_bin_testflatout.out test_xds_bin_testflatout_orig.out
echo testflatpackedout.cbf | $(TIME) $(BIN)/test_xds_binary > test_xds_bin_testflatpackedout.out
@@ -1599,7 +1606,7 @@ endif
$(TIME) $(BIN)/cif2cbf -I 4 -C 100. -L 0. -e n -c b -i XRD1621.cbf -o XRD1621_I4encbC100.cbf
-$(DIFF) XRD1621_I4encbC100.cbf XRD1621_I4encbC100_orig.cbf
-ifneq ($(F90C),)
+ifneq ($(FC),)
extra_sigs_only: $(BIN)/convert_image $(BIN)/convert_minicbf $(BIN)/cif2cbf $(BIN)/testcell \
$(BIN)/testreals $(BIN)/testflat $(BIN)/testflatpacked \
$(BIN)/test_xds_binary $(BIN)/test_fcb_read_image $(BIN)/convert_minicbf \
@@ -1650,7 +1657,7 @@ endif
-cmp testflatin.cbf testflatout.cbf
$(TIME) $(BIN)/testflatpacked
-cmp testflatpackedin.cbf testflatpackedout.cbf
-ifneq ($(F90C),)
+ifneq ($(FC),)
echo testflatout.cbf | $(TIME) $(BIN)/test_xds_binary | \
$(SIGNATURE) | $(DIFF) - test_xds_bin_testflatout_orig.out$(SEXT)
echo testflatpackedout.cbf | $(TIME) $(BIN)/test_xds_binary | \
|
GitWeb