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
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Add shared_library build support
Last-Updated: 2013-05-21
Forwarded: no
Index: xgks-2.6.1/src/port/acsite.m4
===================================================================
--- xgks-2.6.1.orig/src/port/acsite.m4 2010-07-03 19:09:51.000000000 +0100
+++ xgks-2.6.1/src/port/acsite.m4 2010-07-03 19:09:51.000000000 +0100
@@ -2227,7 +2227,7 @@
if test -z "$MAJOR_NO"; then
if test "$VERSION"; then \
MAJOR_NO=`echo $VERSION |
- sed -n '/^\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*.*/s//\1/p;q'`
+ sed -n '/^\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]].*/s//\1/p;q'`
else
MAJOR_NO=
fi
@@ -2236,13 +2236,22 @@
if test -z "$MINOR_NO"; then
if test "$VERSION"; then \
MINOR_NO=`echo $VERSION |
- sed -n '/^[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\).*/s//\1/p;q'`
+ sed -n '/^[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]].*/s//\1/p;q'`
else
MINOR_NO=
fi
fi
-AC_SUBST(MINOR_NO)dnl
-AC_MSG_RESULT($MAJOR_NO.$MINOR_NO)
+AC_SUBST(PATCH_NO)dnl
+if test -z "$PATCH_NO"; then
+ if test "$VERSION"; then \
+ PATCH_NO=`echo $VERSION |
+ sed -n '/^[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\).*/s//\1/p;q'`
+ else
+ PATCH_NO=0
+ fi
+fi
+AC_SUBST(PATCH_NO)dnl
+AC_MSG_RESULT($MAJOR_NO.$MINOR_NO.$PATCH_NO)
])
Index: xgks-2.6.1/src/port/master.mk.in
===================================================================
--- xgks-2.6.1.orig/src/port/master.mk.in 2010-07-03 19:09:45.000000000 +0100
+++ xgks-2.6.1/src/port/master.mk.in 2010-07-03 22:11:56.000000000 +0100
@@ -27,8 +27,8 @@
SHELL = /bin/sh
TBL = @TBL@
WHICH = @WHICH@
-
-
+MAJOR_NO = @MAJOR_NO@
+MINOR_NO = @MINOR_NO@
############################################################################
# Recursive make(1)s in Subdirectories:
@@ -147,10 +147,21 @@
LIBDIR = $(exec_prefix)/lib
LIB_A = lib$(LIBRARY).a
LIBFILE = dummy-libfile # to silence GNU make(1)
+LIBSONAME = lib$(LIBRARY).so.$(MAJOR_NO)
+LIB_SO = lib$(LIBRARY).so.$(MAJOR_NO).$(MINOR_NO)
+LIB_SA = lib$(LIBRARY).sa.$(MAJOR_NO).$(MINOR_NO)
+DYN_OBJS = $(subst .o,.so, $(LIBOBJS))
+remote_shlib: $(REMOTE_SHLIB)
+dyn_objs: $(DYN_OBJS)
+
+$(REMOTE_SHLIB): $(DYN_OBJS) ../c/*.so ../c/cgm/*.so ../c/gksm/*.so ../c/x/*.so
+ $(CC) $(LDFLAGS) -shared -o $(REMOTE_SHLIB) $(SHLIBFLAGS) -Wl,-soname,$(LIBSONAME) $(SO_OBJS) $^ $(DYN_LIBS)
+
library: $(LIB_A)
-
+shared_library: $(LIB_SO)
remote_library: $(REMOTE_LIBRARY)
+remote_shlib: $(REMOTE_SHLIB)
# The following rule is forced because the library can be created by a
# makefile in another directory prior to the execution of the following rule.
@@ -201,38 +212,34 @@
mkdir -p $@
chmod u+rwx,g+rws,o=rx $@
-LIB_SO = lib$(LIBRARY).so.$(MAJOR_NO).$(MINOR_NO)
-LIB_SA = lib$(LIBRARY).sa.$(MAJOR_NO).$(MINOR_NO)
-#library: FORCE
-# @so_objs=`echo $(LIBOBJS) | sed 's/\.o/.so/g'`; \
-# if [ -z "$$so_objs" ]; then \
-# :; \
-# else \
-# $(MAKE) $(MFLAGS) $(LIB_SO) \
-# SO_OBJS="$$so_objs"; \
-# fi
-# @if [ -z "$(SA_OBJS)" ]; then \
-# :; \
-# else \
-# $(MAKE) $(MFLAGS) $(LIB_SA); \
-# fi
+library: FORCE
+ @so_objs=`echo $(LIBOBJS) | sed 's/\.o/.so/g'`; \
+ if [ -z "$$so_objs" ]; then \
+ :; \
+ else \
+ $(MAKE) $(MFLAGS) $(LIB_SO) \
+ SO_OBJS="$$so_objs"; \
+ fi
+ @if [ -z "$(SA_OBJS)" ]; then \
+ :; \
+ else \
+ $(MAKE) $(MFLAGS) $(LIB_SA); \
+ fi
-$(LIB_SO): $(SO_OBJS)
- ld -assert pure-text $(SO_OBJS) -o $@
+$(LIB_SO): $(SO_OBJS) $(wildcard $(patsubst %,%/*.so, $(SUBDIRS)))
+ $(CC) $(LDFLAGS) -shared -o $(LIB_SO) $(SHLIBFLAGS) -Wl,-soname,$(LIBSONAME) $^ $(DYN_LIBS)
$(LIB_SA): $(SA_OBJS) FORCE
$(AR) rcuv $@ $(SA_OBJS)
.fc.so:
$(FORTC) -O $(OS) $< > $*.c \
|| (rm -f $*.c; exit 1)
- $(CC) -c -o $$$$.o -pic $(CFLAGS) $(CPPFLAGS) $*.c \
- || (rm -f $$$$.o; exit 1)
- mv $$$$.o $@
+ $(CC) -c -o $@ -fPIC $(CFLAGS) $(CPPFLAGS) $*.c
.c.so:
- $(CC) -c -o $$$$.o -pic $(CFLAGS) $(CPPFLAGS) $< \
- || (rm -f $$$$.o; exit 1)
- mv $$$$.o $@
+ $(CC) -c -o $@ -fPIC $(CFLAGS) $(CPPFLAGS) $<
+.f.so:
+ $(FC) -c -o $@ -fPIC $(FFLAGS) $<
#installed_library: $(LIBDIR)/$(LIB_SO)
# @if [ -z "$(SA_OBJS)" ]; then \
Index: xgks-2.6.1/src/lib/c/Makefile.in
===================================================================
--- xgks-2.6.1.orig/src/lib/c/Makefile.in 2010-07-03 19:09:45.000000000 +0100
+++ xgks-2.6.1/src/lib/c/Makefile.in 2010-07-03 19:09:51.000000000 +0100
@@ -41,7 +41,7 @@
MANIFEST = Makefile.in depend $(HEADERS) $(headers) $(csrcs) $(fcsrcs)
-all: gkserrmsg.h cgm/all gksm/all x/all library
+all: gkserrmsg.h cgm/all gksm/all x/all library shared_library
install: installed_library installed_headers
Index: xgks-2.6.1/src/lib/fortran/Makefile.in
===================================================================
--- xgks-2.6.1.orig/src/lib/fortran/Makefile.in 2010-07-03 19:09:45.000000000 +0100
+++ xgks-2.6.1/src/lib/fortran/Makefile.in 2010-07-03 22:18:25.000000000 +0100
@@ -2,14 +2,16 @@
#
# $Id: Makefile.in,v 2.7 2000/08/07 22:23:57 emmerson Exp $
-LIBNAME = xgks
-REMOTE_LIBRARY = ../c/lib$(LIBNAME).a
+LIBRARY = xgks
+REMOTE_LIBRARY = ../c/lib$(LIBRARY).a
+REMOTE_SHLIB = ../c/lib$(LIBRARY).so.$(MAJOR_NO).$(MINOR_NO)
CPP_X11 = @CPP_X11@
INCLUDES = -I../../port/misc -I../c $(CPP_X11)
DEFINES = -DOS_$(OS)
CPPFLAGS = $(INCLUDES) $(DEFINES) @CPPFLAGS@
CFLAGS = @CFLAGS@
+DYN_LIBS = -lX11 -lm -lgfortran
headers = f_errno.h fortmac.h fortxgks.h pdrutils.h ps2aixdefs.h
SRCS = control.fc error.fc escapes.fc fexterninit.c \
@@ -35,7 +37,7 @@
inqwslist.c meta.c output.c rep.c segattr.c \
segment.c transform.c utils.c wsioutattr.c
-all:: $(REMOTE_LIBRARY)
+all:: $(REMOTE_LIBRARY) remote_shlib
include ../../port/master.mk
Index: xgks-2.6.1/src/lib/c/cgm/Makefile.in
===================================================================
--- xgks-2.6.1.orig/src/lib/c/cgm/Makefile.in 2010-07-03 19:09:45.000000000 +0100
+++ xgks-2.6.1/src/lib/c/cgm/Makefile.in 2010-07-03 19:09:51.000000000 +0100
@@ -4,6 +4,7 @@
LIBNAME = xgks
REMOTE_LIBRARY = ../lib$(LIBNAME).a
+REMOTE_SHLIB = ../c/lib$(LIBNAME).so.$(MAJOR_NO).$(MINOR_NO)
CPP_X11 = @CPP_X11@
INCLUDES = -I.. -I../../../port/misc $(CPP_X11)
CPPFLAGS = $(INCLUDES) @CPPFLAGS@
@@ -13,7 +14,7 @@
MANIFEST = Makefile.in depend cgm.h cgm_implem.h cgmi.c cgmo.c
-all:: $(REMOTE_LIBRARY)
+all:: $(REMOTE_LIBRARY) dyn_objs
tags: FORCE
ctags -t cgm.h cgm_implem.h cgmi.c cgmo.c \
Index: xgks-2.6.1/src/lib/c/gksm/Makefile.in
===================================================================
--- xgks-2.6.1.orig/src/lib/c/gksm/Makefile.in 2010-07-03 19:09:45.000000000 +0100
+++ xgks-2.6.1/src/lib/c/gksm/Makefile.in 2010-07-03 19:09:51.000000000 +0100
@@ -4,6 +4,7 @@
LIBNAME = xgks
REMOTE_LIBRARY = ../lib$(LIBNAME).a
+REMOTE_SHLIB = ../c/lib$(LIBNAME).so.$(MAJOR_NO).$(MINOR_NO)
CPP_X11 = @CPP_X11@
INCLUDES = -I.. -I../../../port/misc $(CPP_X11)
CPPFLAGS = $(INCLUDES) @CPPFLAGS@
@@ -13,7 +14,7 @@
MANIFEST = Makefile.in depend gksm.c gksm.h gksm_implem.h
-all:: $(REMOTE_LIBRARY)
+all:: $(REMOTE_LIBRARY) dyn_objs
include ../../../port/master.mk
Index: xgks-2.6.1/src/lib/c/x/Makefile.in
===================================================================
--- xgks-2.6.1.orig/src/lib/c/x/Makefile.in 2010-07-03 19:09:45.000000000 +0100
+++ xgks-2.6.1/src/lib/c/x/Makefile.in 2010-07-03 19:09:51.000000000 +0100
@@ -4,6 +4,7 @@
LIBNAME = xgks
REMOTE_LIBRARY = ../lib$(LIBNAME).a
+REMOTE_SHLIB = ../c/lib$(LIBNAME).so.$(MAJOR_NO).$(MINOR_NO)
CPP_X11 = @CPP_X11@
INCLUDES = -I.. -I../../../port/misc $(CPP_X11)
CPPFLAGS = $(INCLUDES) @CPPFLAGS@
@@ -19,7 +20,7 @@
xinqpixel.c xopws.c xpline.c xpmarker.c xport.c xtext.c \
xupdate.c
-all:: $(REMOTE_LIBRARY)
+all:: $(REMOTE_LIBRARY) dyn_objs
tags: FORCE
ctags -t *.c ../*.c ../*.h
|
