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
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
|
$NetBSD: patch-ai,v 1.2 2010/02/06 10:37:06 sno Exp $
--- config/Makefile.SH.orig 2010-01-09 17:59:48.000000000 +0000
+++ config/Makefile.SH
@@ -70,7 +70,7 @@ plotrunpath=
case "$which_graphic_lib" in
*X11*)
PLOTCFLAGS="$PLOTCFLAGS $X11_INC"
- PLOTLIBS="$PLOTLIBS $X11_LIBS"
+ PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS"
plotrunpath=$X11
graph="plotX $graph"
;;
@@ -110,25 +110,12 @@ if test -n "$runpathprefix"; then
RUNPTH=`$config_dir/ldflags "$LDneedsWl" "$runpathprefix$TOP/$objdir$dir_sep$tmp"`
fi
-if test -z "$DLLD"; then
- exec="gp-sta"; static=y
-else
- exec="gp-sta gp-dyn"
-fi
case "$sizeof_long" in
4) numbits=32;;
8) numbits=64;;
esac
dotest="env \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits"
-if test -z "$emacs"; then
- install_emacs_files=
-else
- install_emacs_files=install_emacs_files
-fi
-case "$static" in
- n) dft=dyn; libdft=lib-dyn;;
- y) dft=sta; libdft= ;;
-esac
+install_emacs_files=install_emacs_files
CPPFLAGS="-I. -I$src/headers"
if test "$has_dlopen" = builtin; then
@@ -153,16 +140,14 @@ AR = ar
SIZEOF_LONG= $sizeof_long
CC_FLAVOR =
-CC = $CC \$(CC_FLAVOR)
+CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR)
CPPFLAGS = $CPPFLAGS
CFLAGS = $CFLAGS
DLCFLAGS = $DLCFLAGS
LD_FLAVOR = \$(CC_FLAVOR)
-LD = $LD \$(LD_FLAVOR)
+LD = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR)
LDFLAGS = $LDFLAGS
DLLD_FLAVOR = \$(LD_FLAVOR)
-DLLD = $DLLD \$(DLLD_FLAVOR)
-DLLDFLAGS = $DLLDFLAGS
EXTRADLLDFLAGS = $EXTRADLLDFLAGS
# HIGHLY EXPERIMENTAL (only tested with gmp-4.0 on ix86 and Ultra).
@@ -179,29 +164,19 @@ EXTRADLLDFLAGS = $EXTRADLLDFLAGS
#the following line
#GMPO2 = \$(GMP)/sparcv9.o
-_O = .o
-_A = .a
+_O = .lo
+_A = .la
LIB_PREFIX = $lib_prefix
-DLLIB_PREFIX = $dllib_prefix
-LIBPARI_BASE = $libpari_base
-LIBPARI = \$(LIB_PREFIX)pari
-DLLIBPARI = \$(DLLIB_PREFIX)pari
-LIBPARI_STA = \$(LIBPARI)\$(_A)
-LIBPARI_SO = \$(DLLIBPARI).$DLSUFFIX
-SOLIBPARI = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX
-LIBPARI_DYN = \$(SOLIBPARI)$sodest
-LIBPARI_SONAME= \$(SOLIBPARI)$soname
+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A)
DL_DFLT_NAME = $DL_DFLT_NAME
EXPORT_FILE = $export_file
EXPORT_CREATE = $export_create
EXPORT_LIB = $export_lib
EXPORT_LIB_CREATE = $export_lib_create
-DLLD_IGNORE = $dlld_ignore
RUNPTH = $RUNPTH
RUNPTH_FINAL = $RUNPTH_FINAL
-LDDYN = $LDDYN
LIBS = $LIBS
RM = rm -f
@@ -226,8 +201,10 @@ MISCDIR = \$(DATADIR)/misc
DOCDIR = \$(DATADIR)/doc
INSTALL = $cfg/install
-INSTALL_PROGRAM = \$(INSTALL)
-INSTALL_DATA = \$(INSTALL) -m 644
+INSTALL_PROGRAM = \$(BSD_INSTALL_PROGRAM)
+INSTALL_SCRIPT = \$(BSD_INSTALL_SCRIPT)
+INSTALL_DATA = \$(BSD_INSTALL_DATA)
+INSTALL_MAN = \$(BSD_INSTALL_MAN)
# Readline
RLINCLUDE = $RLINCLUDE
@@ -239,7 +216,7 @@ QTDIR = "$QTDIR"
MOC = \$(QTDIR)/bin/moc
PLOTCFLAGS = $PLOTCFLAGS
PLOTLIBS = $PLOTLIBS
-CPLUSPLUS = g++
+CPLUSPLUS = \$(LIBTOOL) --mode=compile $CXX \$(CXX_FLAVOR)
FLTKDIR = "$FLTKDIR"
@@ -254,21 +231,16 @@ DOTEST=$dotest
OBJS = $OBJS
OBJSGP = $OBJSGP
-gp: gp-$dft ../gp$suffix$exe_suff $libdft
+all: \$(LIBPARI)
-../gp$suffix$exe_suff: gp-$dft
- -\$(RM) \$@
- -\$(LN) $ln_objdir/gp-$dft$exe_suff \$@
+lib: \$(LIBPARI)
-all: $exec lib-sta
+\$(LIBPARI): \$(OBJS)
+ \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) --version-info 0:0
-lib-sta: \$(LIBPARI_STA)
-lib-dyn: \$(LIBPARI_DYN)
-
-\$(LIBPARI_STA): $add_funclist \$(OBJS)
- -\$(RM) \$@
- \$(AR) r \$@ \$(OBJS)
- -$ranlib \$@
+gp: \$(OBJSGP) \$(LIBPARI)
+ \$(RM) \$@
+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI)
kerntest\$(_O): $src/test/kerntest.c
\$(CC) -c \$(CFLAGS) -I$src/language \$(CPPFLAGS) -o \$@ $src/test/kerntest.c
@@ -297,11 +269,6 @@ tune-dyn: tune.o \$(LIBPARI_DYN)
tune-sta: tune.o \$(LIBPARI_STA)
\$(LD) \$(LDFLAGS) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(LIBS)
-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP)
- \$(RM) \$@
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS)
- $postconfig gp-sta
-
cleanemacs:
\$(RM) $emx/*.elc
cleantest:
@@ -316,7 +283,7 @@ clean: cleanobj cleantest cleanemacs cle
.headers: $HEADERS
@touch \$@
-install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
+install: install-lib install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
install-include:
-mkdir -p \$(INCLUDEDIR)/pari
@@ -324,23 +291,11 @@ install-include:
\$(INSTALL_DATA) \$\$i \$(INCLUDEDIR)/pari; done
-for i in $headerlist; do \\
\$(INSTALL_DATA) $src/headers/\$\$i.h \$(INCLUDEDIR)/pari; done
- -\$(RM) \$(INCLUDEDIR)/pari/genpari.h
-\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h
-install-bin: install-bin-$dft
-
-install-bin-dyn: gp-dyn
+install-bin: gp
-mkdir -p \$(BINDIR)
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff
- $postconfig \$(BINDIR)/gp-$version$exe_suff
- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
-
-install-bin-sta: gp-sta
- -mkdir -p \$(BINDIR)
- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
- \$(INSTALL_PROGRAM) gp-sta$exe_suff \$(BINDIR)/gp-$version$exe_suff
+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(BINDIR)/gp-$version$exe_suff
-\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
# Can't strip it if we want install() to work on OSF.
# -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version
@@ -348,24 +303,22 @@ install-bin-sta: gp-sta
install-man::
-mkdir -p \$(MANDIR)
- -\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1
- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
- \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1
+ \$(INSTALL_MAN) $doc/gphelp.1 \$(MANDIR)
+ \$(INSTALL_MAN) $doc/gp.1 \$(MANDIR)
-\$(LN) gp.1 \$(MANDIR)/pari.1
- -\$(LN) gp-$version.1 \$(MANDIR)/gp.1
install-misc: $install_emacs_files
-mkdir -p \$(MISCDIR) \$(BINDIR)
- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
- \$(INSTALL_DATA) $misc/README \$(MISCDIR)
- \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
- \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
- \$(INSTALL_PROGRAM) $misc/gpflog \$(MISCDIR)
- \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR)
- \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR)
- \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR)
- \$(INSTALL_PROGRAM) $misc/xgp \$(MISCDIR)
+ \$(INSTALL_SCRIPT) $misc/tex2mail \$(BINDIR)
+ \$(INSTALL_MAN) $doc/tex2mail.1 \$(MANDIR)
+ \$(INSTALL_DATA) $misc/README \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR)
+ \$(INSTALL_SCRIPT) $misc/gpflog \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR)
+ \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR)
+ \$(INSTALL_SCRIPT) $misc/xgp \$(MISCDIR)
install-cfg::
-mkdir -p \$(SYSDATADIR)
@@ -377,8 +330,15 @@ install-cfg::
install-doc::
-mkdir -p \$(BINDIR) \$(DOCDIR)
+ -\$(INSTALL_DATA) ../AUTHORS \$(DATADIR)
+ -\$(INSTALL_DATA) ../CHANGES \$(DATADIR)
+ -\$(INSTALL_DATA) ../COMPAT \$(DATADIR)
+ -\$(INSTALL_DATA) ../COPYING \$(DATADIR)
+ -\$(INSTALL_DATA) ../MACHINES \$(DATADIR)
+ -\$(INSTALL_DATA) ../NEW \$(DATADIR)
+ -\$(INSTALL_DATA) ../README \$(DATADIR)
-cd $doc; \$(MAKE) all
- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR)
+ -\$(INSTALL_SCRIPT) $doc/gphelp \$(BINDIR)
-\$(INSTALL_DATA) $doc/Makefile \$(DOCDIR)
-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR)
@@ -426,20 +386,9 @@ install-data:
done; \
fi
-install-lib-sta: \$(LIBPARI_STA)
+install-lib: \$(LIBPARI)
-mkdir -p \$(LIBDIR)
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA)
-
-install-lib-dyn-base:
- -mkdir -p \$(LIBDIR)
- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO)
- \$(INSTALL_PROGRAM) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_DYN)
-install-lib-dyn-link: install-lib-dyn-base
- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME);\
- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi
-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link
+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/
pariinl.h: parilvl0.h parilvl1.h
cat parilvl0.h parilvl1.h > pariinl.h
@@ -462,63 +411,13 @@ dotest-$i::
EOT
done
-if test -z "$DLLD"; then
- cat >> $file << EOT
-
-\$(LIBPARI_DYN)::
- @echo "Configure could not find a way to build a shared library on this machine"
-
-EOT
-else
- if test -n "$export_file"; then
- cat >> $file << EOT
-
-EXPORT_FILE_BASE = $src/systems/os2/pari.def.base
-VERSION_VERBOSE = $pari_release_verbose
-
-\$(EXPORT_FILE): \$(OBJS) \$(EXPORT_FILE_BASE)
- cat \$(EXPORT_FILE_BASE) | sed 's/<DLL_BASE>/\$(DLLIBPARI)/' | sed 's/<VENDOR>/pari.math.u-bordeaux.fr\//' | sed 's/<VERSION>/\$(VERSION_VERBOSE)/' | sed 's/<DESCR>/GP\/PARI compiled with \$(CFLAGS)/' > \$@
- \$(EXPORT_CREATE) \$(OBJS) >> \$@
-
-\$(DLLIBPARI)\$(_A): \$(EXPORT_FILE)
- \$(EXPORT_LIB_CREATE) -o \$@ \$(EXPORT_FILE)
-
-EOT
- fi
- cat >> $file << EOT
-
-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB)
- \$(RM) \$@
- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
- $postconfig gp-dyn
-
-\$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE)
- -\$(RM) \$(LIBPARI_DYN)
- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(EXPORT_FILE)
- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SO)"; then \
- \$(RM) \$(LIBPARI_SO);\
- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SO); fi
- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SONAME)"; then \
- \$(RM) \$(LIBPARI_SONAME);\
- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SONAME); fi
-EOT
-fi
-
-if test -n "$emacs"; then
- cat >> $file << EOT
-elc:
- @echo "Byte-Compiling elisp files..."
- -cd $emx; $emacs -batch \
- --eval '(setq load-path (append (list ".") load-path))' \
- -f batch-byte-compile *.el
-
-$install_emacs_files: elc
+cat >> $file << EOT
+$install_emacs_files:
-mkdir -p \$(EMACSDIR)
-cd $emx; for f in *.elc *.el pariemacs.txt; do \
\$(INSTALL_DATA) \$\$f \$(EMACSDIR); \
done
EOT
-fi
if test -n "$add_funclist"; then
cat >> $file << EOT
|
