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
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
|
diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in
--- yap-6.orig/library/matrix/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/library/matrix/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -47,10 +48,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@matrix.@SO@: matrix.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in
--- yap-6.orig/library/random/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/library/random/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -47,10 +48,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@yap_random.@SO@: yap_random.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in
--- yap-6.orig/library/regex/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/library/regex/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -59,22 +60,22 @@
$(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regexp.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
@DO_SECOND_LD@regcomp.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regerror.@SO@: regerror.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regfree.@SO@: regfree.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regexec.@SO@: regexec.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in
--- yap-6.orig/library/rltree/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/library/rltree/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -25,6 +25,7 @@
CC=@CC@
MPI_CC=mpicc
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -52,10 +53,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@yap_rl.@SO@: $(OBJS)
-@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in
--- yap-6.orig/library/system/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/library/system/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -47,10 +48,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o
@DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@sys.@SO@: sys.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in
--- yap-6.orig/library/tries/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/library/tries/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -60,13 +61,13 @@
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@tries.@SO@: core_tries.o base_tries.o tries.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
--- yap-6.orig/packages/PLStream/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/packages/PLStream/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -21,6 +21,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -77,10 +78,10 @@
$(CC) -c $(CFLAGS) $< -o $@
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@libplstream.@SO@: $(OBJS)
-@DO_SECOND_LD@ @SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/clib/Makefile.in yap-6/packages/clib/Makefile.in
--- yap-6.orig/packages/clib/Makefile.in 2010-10-18 21:48:20.000000000 +1300
+++ yap-6/packages/clib/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -37,7 +37,7 @@
CRYPTLIBS=@CLIB_CRYPTLIBS@
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)
diff -ur yap-6.orig/packages/http/Makefile.in yap-6/packages/http/Makefile.in
--- yap-6.orig/packages/http/Makefile.in 2010-10-18 21:48:21.000000000 +1300
+++ yap-6/packages/http/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -38,7 +38,7 @@
#
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)/http
diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in
--- yap-6.orig/packages/jpl/Makefile.in 2010-10-18 21:48:36.000000000 +1300
+++ yap-6/packages/jpl/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -34,6 +34,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ @JAVAINCPATH@
+LDFLAGS=@LDFLAGS@
MKINDEX=true
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)
@@ -96,7 +97,7 @@
@DO_SECOND_LD@%.@SO@: %.o
- @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
+ @DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
if [ -r libjpl.dylib ]; then \
rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \
fi
diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in
--- yap-6.orig/packages/semweb/Makefile.in 2010-10-18 21:48:21.000000000 +1300
+++ yap-6/packages/semweb/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -47,7 +47,7 @@
#
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb
diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
--- yap-6.orig/packages/sgml/Makefile.in 2010-10-18 21:48:21.000000000 +1300
+++ yap-6/packages/sgml/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -30,6 +30,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+LDFLAGS=@LDFLAGS@
MKINDEX=true
LD=$(CC)
@@ -116,7 +117,7 @@
$(CC) $(CFLAGS) -o $@ -c $<
@DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ)
-@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
all: $(TARGETS) $(PROGRAMS)
diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in
--- yap-6.orig/packages/swi-minisat2/C/Makefile.in 2010-10-18 21:48:21.000000000 +1300
+++ yap-6/packages/swi-minisat2/C/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -22,6 +22,7 @@
CC=@CC@
CXX=@CXX@
CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -69,7 +70,7 @@
$(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
@DO_SECOND_LD@pl-minisat.@SO@: $(OBJS)
-@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
+@DO_SECOND_LD@ @SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/tai/Makefile.in yap-6/packages/tai/Makefile.in
--- yap-6.orig/packages/tai/Makefile.in 2010-10-18 21:48:21.000000000 +1300
+++ yap-6/packages/tai/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -48,7 +49,7 @@
$(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o
@DO_SECOND_LD@pl-tai.@SO@: pl-tai.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/zlib/Makefile.in yap-6/packages/zlib/Makefile.in
--- yap-6.orig/packages/zlib/Makefile.in 2010-10-18 21:48:21.000000000 +1300
+++ yap-6/packages/zlib/Makefile.in 2010-10-19 19:44:05.000000000 +1300
@@ -45,7 +45,7 @@
#
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)
|
GitWeb