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
|
diff -ur -x Makefile.platform pdb-extract-v1.700-prod-src.orig/connect-v2.2/Makefile pdb-extract-v1.700-prod-src/connect-v2.2/Makefile
--- pdb-extract-v1.700-prod-src.orig/connect-v2.2/Makefile 2005-07-13 06:22:23.000000000 -0700
+++ pdb-extract-v1.700-prod-src/connect-v2.2/Makefile 2005-12-18 23:34:56.000000000 -0800
@@ -31,22 +31,22 @@
#----------------------------------------------------------------------------
include ../etc/Makefile.platform
-LIBS = $(LIBINSTDIR)/libciffileobj.a \
- $(LIBINSTDIR)/libtblindex.a \
- $(LIBINSTDIR)/libcifobj.a \
- $(LIBINSTDIR)/libistable.a \
- $(LIBINSTDIR)/libregex.a \
- $(LIBINSTDIR)/libcifstr.a \
- $(LIBINSTDIR)/libndbmisc.a
+LIBS = $(LIBDIR)/libciffileobj.a \
+ $(LIBDIR)/libtblindex.a \
+ $(LIBDIR)/libcifobj.a \
+ $(LIBDIR)/libistable.a \
+ $(LIBDIR)/libregex.a \
+ $(LIBDIR)/libcifstr.a \
+ $(LIBDIR)/libndbmisc.a
LIBSH = $(LIBINSTDIR)/libndbhtml.a \
- $(LIBINSTDIR)/libciffileobj.a \
- $(LIBINSTDIR)/libtblindex.a \
- $(LIBINSTDIR)/libcifobj.a \
- $(LIBINSTDIR)/libistable.a \
- $(LIBINSTDIR)/libregex.a \
- $(LIBINSTDIR)/libcifstr.a \
- $(LIBINSTDIR)/libndbmisc.a
+ $(LIBDIR)/libciffileobj.a \
+ $(LIBDIR)/libtblindex.a \
+ $(LIBDIR)/libcifobj.a \
+ $(LIBDIR)/libistable.a \
+ $(LIBDIR)/libregex.a \
+ $(LIBDIR)/libcifstr.a \
+ $(LIBDIR)/libndbmisc.a
#----------------------------------------------------------------------------
# Target definitions.
@@ -261,10 +261,10 @@
$(CCC) $(C++FLAGS) -o $@ $(OBJ7) $(OBJS4) $(LIBS) $(LDFLAGS) -lm
$(TARGET8): $(OBJ8)
- $(CCC) $(C++FLAGS) -o $@ $(OBJ8) $(LIBINSTDIR)/libndbmisc.a $(LDFLAGS) -lm
+ $(CCC) $(C++FLAGS) -o $@ $(OBJ8) $(LIBDIR)/libndbmisc.a $(LDFLAGS) -lm
$(TARGET9): $(OBJ9)
- $(CCC) $(C++FLAGS) -o $@ $(OBJ9) $(LIBINSTDIR)/libndbmisc.a $(LDFLAGS) -lm
+ $(CCC) $(C++FLAGS) -o $@ $(OBJ9) $(LIBDIR)/libndbmisc.a $(LDFLAGS) -lm
$(TARGET10): $(LIBSH) $(HFILES) $(NDBLIB) $(OBJ10) $(OBJS6)
$(CCC) $(C++FLAGS) -o $@ $(OBJ10) $(OBJS6) $(NDBLIB) $(LIBSH) $(LDFLAGS) -lm
diff -ur -x Makefile.platform pdb-extract-v1.700-prod-src.orig/etc/make.platform.gnu3 pdb-extract-v1.700-prod-src/etc/make.platform.gnu3
--- pdb-extract-v1.700-prod-src.orig/etc/make.platform.gnu3 2005-07-13 06:22:18.000000000 -0700
+++ pdb-extract-v1.700-prod-src/etc/make.platform.gnu3 2005-12-18 23:42:06.000000000 -0800
@@ -6,6 +6,8 @@
##
##########################################################################
+LIBDIR= /usr/lib
+
#-----Lexer and Parser section-------------------------------------------#
# Lexer executable
@@ -89,7 +91,7 @@
DEFINES=$(GDEFINES) $(LDEFINES)
## Global include directories
-GINCLUDES=
+GINCLUDES= -I/usr/include/rcsb
# Collect all include directories from global include directories and
# include directories specified in module makefile
@@ -107,8 +109,8 @@
C_WARNINGS=$(WARNINGS)
# C compiler flags
-CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
$(INCLUDES)
## C++ compiler
@@ -128,9 +130,9 @@
EXT=C
# C++ compiler flags
-C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
$(INCLUDES)
-C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
$(DEFINES) $(INCLUDES)
# C++FLAGS_RELAXED should be set to avoid warnings reported by third party
# source code that is not maintained by PDB
@@ -144,7 +146,7 @@
F77=f77
# Fortran compiler flags
-FFLAGS=-O -u
+FFLAGS=$(F_OPT)
# Additional Fortran libraries
F77LIBS=
diff -ur -x Makefile.platform pdb-extract-v1.700-prod-src.orig/etc/make.platform.gnu4 pdb-extract-v1.700-prod-src/etc/make.platform.gnu4
--- pdb-extract-v1.700-prod-src.orig/etc/make.platform.gnu4 2005-07-13 06:22:18.000000000 -0700
+++ pdb-extract-v1.700-prod-src/etc/make.platform.gnu4 2005-12-18 23:33:50.000000000 -0800
@@ -6,6 +6,8 @@
##
##########################################################################
+LIBDIR= /usr/lib
+
#-----Lexer and Parser section-------------------------------------------#
# Lexer executable
@@ -34,7 +36,7 @@
# WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all
# warnings as errors.
-WARNINGS_AS_ERRORS=-Werror
+WARNINGS_AS_ERRORS=
# ALL_WARNINGS defines flags to instruct all compilers to report all
# warnings.
@@ -90,7 +92,7 @@
DEFINES=$(GDEFINES) $(LDEFINES)
## Global include directories
-GINCLUDES=
+GINCLUDES= -I/usr/include/rcsb
# Collect all include directories from global include directories and
# include directories specified in module makefile
@@ -108,8 +110,8 @@
C_WARNINGS=$(WARNINGS)
# C compiler flags
-CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
+CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
$(INCLUDES)
## C++ compiler
@@ -129,9 +131,9 @@
EXT=C
# C++ compiler flags
-C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
+C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
$(INCLUDES)
-C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
+C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
$(DEFINES) $(INCLUDES)
# C++FLAGS_RELAXED should be set to avoid warnings reported by third party
# source code that is not maintained by PDB
@@ -145,7 +147,7 @@
F77=f77
# Fortran compiler flags
-FFLAGS=-O -u
+FFLAGS=$(F_OPT)
# Additional Fortran libraries
F77LIBS=
diff -ur -x Makefile.platform pdb-extract-v1.700-prod-src.orig/Makefile pdb-extract-v1.700-prod-src/Makefile
--- pdb-extract-v1.700-prod-src.orig/Makefile 2005-07-13 06:22:16.000000000 -0700
+++ pdb-extract-v1.700-prod-src/Makefile 2005-12-18 23:39:23.000000000 -0800
@@ -22,10 +22,7 @@
DATADIRS = data pdb-extract-data
-LIBDIRS = misclib-v2.1 regex-v2.1 ciflib-common-v3.02 cifobj-common-v4.04 \
- btree-obj-v3.1 cif-table-obj-v6.1 cifparse-obj-v6.3 \
- htmllib-v3.1 connect-v2.2 filterlib-v8.2 $(EXTRACT) \
- validation-v6.2 maxit-v8.2
+LIBDIRS = htmllib-v3.1 connect-v2.2 filterlib-v8.2 $(EXTRACT)
all: compile
@@ -60,7 +57,7 @@
echo "------------------------------------------------------------"; \
echo "**** Making $$libdir ****"; \
echo "------------------------------------------------------------"; \
- (cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \
+ (cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CCC_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" install) || exit 1; \
done
binary:
diff -ur -x Makefile.platform pdb-extract-v1.700-prod-src.orig/pdb-extract-v1.7/Makefile pdb-extract-v1.700-prod-src/pdb-extract-v1.7/Makefile
--- pdb-extract-v1.700-prod-src.orig/pdb-extract-v1.7/Makefile 2005-07-13 06:22:24.000000000 -0700
+++ pdb-extract-v1.700-prod-src/pdb-extract-v1.7/Makefile 2005-12-18 23:37:16.000000000 -0800
@@ -27,13 +27,13 @@
#----------------------------------------------------------------------------
include ../etc/Makefile.platform
-CIFLIBS = $(LIBINSTDIR)/libciffileobj.a \
- $(LIBINSTDIR)/libcifobj.a \
- $(LIBINSTDIR)/libcifstr.a \
- $(LIBINSTDIR)/libistable.a \
- $(LIBINSTDIR)/libregex.a \
- $(LIBINSTDIR)/libtblindex.a \
- $(LIBINSTDIR)/libndbmisc.a
+CIFLIBS = $(LIBDIR)/libciffileobj.a \
+ $(LIBDIR)/libcifobj.a \
+ $(LIBDIR)/libcifstr.a \
+ $(LIBDIR)/libistable.a \
+ $(LIBDIR)/libregex.a \
+ $(LIBDIR)/libtblindex.a \
+ $(LIBDIR)/libndbmisc.a
# TARGET1, 2 is only for test
TARGET1 = $(BIN)/FOtest1
|
GitWeb