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
|
diff -Naur plib-1.8.5.orig/configure.in plib-1.8.5/configure.in
--- plib-1.8.5.orig/configure.in 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/configure.in 2008-04-17 13:47:10.000000000 +0100
@@ -36,7 +36,7 @@
AC_PROG_CXX
AC_PROG_CXXCPP
AC_PROG_INSTALL
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
dnl Command line arguments
diff -Naur plib-1.8.5.orig/src/fnt/Makefile.am plib-1.8.5/src/fnt/Makefile.am
--- plib-1.8.5.orig/src/fnt/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/fnt/Makefile.am 2008-04-17 13:52:53.000000000 +0100
@@ -1,10 +1,12 @@
if BUILD_FNT
-lib_LIBRARIES = libplibfnt.a
+lib_LTLIBRARIES = libplibfnt.la
include_HEADERS = fnt.h
-libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
+libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
+libplibfnt_la_LIBADD = ../util/libplibul.la
+libplibfnt_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/js/Makefile.am plib-1.8.5/src/js/Makefile.am
--- plib-1.8.5.orig/src/js/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/js/Makefile.am 2008-04-17 13:53:33.000000000 +0100
@@ -1,12 +1,15 @@
if BUILD_JS
-lib_LIBRARIES = libplibjs.a
+lib_LTLIBRARIES = libplibjs.la
include_HEADERS = js.h
-libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
+libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \
jsNone.cxx
+libplibjs_la_LIBADD = ../util/libplibul.la
+libplibjs_la_LDFLAGS = -version-info 9:5:8
+
INCLUDES = -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/Makefile.am plib-1.8.5/src/Makefile.am
--- plib-1.8.5.orig/src/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/Makefile.am 2008-04-17 14:16:21.000000000 +0100
@@ -1 +1 @@
-SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw
+SUBDIRS = util fnt sg js sl pui puAux ssg ssgAux net psl pw
diff -Naur plib-1.8.5.orig/src/net/Makefile.am plib-1.8.5/src/net/Makefile.am
--- plib-1.8.5.orig/src/net/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/net/Makefile.am 2008-04-17 13:54:12.000000000 +0100
@@ -1,12 +1,14 @@
if BUILD_NET
-lib_LIBRARIES = libplibnet.a
+lib_LTLIBRARIES = libplibnet.la
include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \
netMonitor.h netSocket.h net.h
-libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
+libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
netMessage.cxx netMonitor.cxx netSocket.cxx
+libplibnet_la_LIBADD = ../util/libplibul.la
+libplibnet_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/psl/Makefile.am plib-1.8.5/src/psl/Makefile.am
--- plib-1.8.5.orig/src/psl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/psl/Makefile.am 2008-04-17 14:13:43.000000000 +0100
@@ -1,16 +1,18 @@
if BUILD_PSL
-lib_LIBRARIES = libplibpsl.a
+lib_LTLIBRARIES = libplibpsl.la
include_HEADERS = psl.h
-libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
+libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
pslExpression.cxx pslProgram.cxx pslDump.cxx \
pslError.cxx pslFileIO.cxx pslCompiler.h \
pslContext.h pslFileIO.h pslLocal.h \
pslOpcodes.h pslSymbol.h
+libplibpsl_la_LIBADD = ../util/libplibul.la
+libplibpsl_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/puAux/Makefile.am plib-1.8.5/src/puAux/Makefile.am
--- plib-1.8.5.orig/src/puAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/puAux/Makefile.am 2008-04-17 14:08:34.000000000 +0100
@@ -1,10 +1,10 @@
if BUILD_PUAUX
-lib_LIBRARIES = libplibpuaux.a
+lib_LTLIBRARIES = libplibpuaux.la
include_HEADERS = puAux.h puAuxLocal.h
-libplibpuaux_a_SOURCES = puAux.cxx \
+libplibpuaux_la_SOURCES = puAux.cxx \
puAuxBiSlider.cxx \
puAuxBiSliderWithEnds.cxx \
puAuxComboBox.cxx \
@@ -19,6 +19,9 @@
puAuxTriSlider.cxx \
puAuxVerticalMenu.cxx \
puAuxChooser.cxx
+libplibpuaux_la_LIBADD = ../util/libplibul.la ../pui/libplibpu.la \
+ ../fnt/libplibfnt.la ../sg/libplibsg.la
+libplibpuaux_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/sg \
-I$(top_srcdir)/src/pui \
diff -Naur plib-1.8.5.orig/src/pui/Makefile.am plib-1.8.5/src/pui/Makefile.am
--- plib-1.8.5.orig/src/pui/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/pui/Makefile.am 2008-04-17 14:09:12.000000000 +0100
@@ -1,10 +1,10 @@
if BUILD_PUI
-lib_LIBRARIES = libplibpu.a
+lib_LTLIBRARIES = libplibpu.la
include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h
-libplibpu_a_SOURCES = \
+libplibpu_la_SOURCES = \
pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \
puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \
puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \
@@ -14,6 +14,8 @@
puDial.cxx \
puRange.cxx \
puInputBase.cxx
+libplibpu_la_LIBADD = ../util/libplibul.la ../fnt/libplibfnt.la
+libplibpu_la_LDFLAGS = -version-info 9:5:8
AM_CPPFLAGS = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/fnt
AM_CPPFLAGS += -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/pw/Makefile.am plib-1.8.5/src/pw/Makefile.am
--- plib-1.8.5.orig/src/pw/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/pw/Makefile.am 2008-04-17 14:13:46.000000000 +0100
@@ -1,10 +1,11 @@
if BUILD_PW
-lib_LIBRARIES = libplibpw.a
+lib_LTLIBRARIES = libplibpw.la
include_HEADERS = pw.h
-libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
+libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
+libplibpw_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/sg/Makefile.am plib-1.8.5/src/sg/Makefile.am
--- plib-1.8.5.orig/src/sg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/sg/Makefile.am 2008-04-17 14:14:23.000000000 +0100
@@ -1,12 +1,14 @@
if BUILD_SG
-lib_LIBRARIES = libplibsg.a
+lib_LTLIBRARIES = libplibsg.la
include_HEADERS = sg.h
-libplibsg_a_SOURCES = sg.cxx sgd.cxx \
+libplibsg_la_SOURCES = sg.cxx sgd.cxx \
sgIsect.cxx sgdIsect.cxx \
sgPerlinNoise.cxx
+libplibsg_la_LIBADD = ../util/libplibul.la
+libplibsg_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/sl/Makefile.am plib-1.8.5/src/sl/Makefile.am
--- plib-1.8.5.orig/src/sl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/sl/Makefile.am 2008-04-17 14:12:02.000000000 +0100
@@ -1,16 +1,19 @@
if BUILD_SL
-lib_LIBRARIES = libplibsl.a libplibsm.a
+lib_LTLIBRARIES = libplibsl.la libplibsm.la
include_HEADERS = sl.h slPortability.h sm.h
-libplibsl_a_SOURCES = \
+libplibsl_la_SOURCES = \
slDSP.cxx slSample.cxx slEnvelope.cxx \
slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
+libplibsl_la_LIBADD = ../util/libplibul.la
+libplibsl_la_LDFLAGS = -version-info 9:5:8
-libplibsm_a_SOURCES = slPortability.h smMixer.cxx
+libplibsm_la_SOURCES = slPortability.h smMixer.cxx
+libplibsm_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/ssg/Makefile.am plib-1.8.5/src/ssg/Makefile.am
--- plib-1.8.5.orig/src/ssg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/ssg/Makefile.am 2008-04-17 14:15:18.000000000 +0100
@@ -1,10 +1,10 @@
if BUILD_SSG
-lib_LIBRARIES = libplibssg.a
+lib_LTLIBRARIES = libplibssg.la
include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h
-libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
+libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \
ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \
ssgLoadDOF.cxx ssgLoadAC.cxx \
@@ -28,6 +28,8 @@
ssgLoadMDL_BGLTexture.cxx ssgLoadXPlaneObj.cxx ssgLoadASC.cxx ssgSaveASC.cxx \
ssgSaveIV.cxx ssgAnimTransform.cxx\
ssgVertSplitter.h ssgVertSplitter.cxx ssgStatistics.cxx
+libplibssg_la_LIBADD = ../util/libplibul.la ../sg/libplibsg.la
+libplibssg_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/ssgAux/Makefile.am plib-1.8.5/src/ssgAux/Makefile.am
--- plib-1.8.5.orig/src/ssgAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/ssgAux/Makefile.am 2008-04-17 14:14:50.000000000 +0100
@@ -1,6 +1,6 @@
if BUILD_SSGAUX
-lib_LIBRARIES = libplibssgaux.a
+lib_LTLIBRARIES = libplibssgaux.la
include_HEADERS = ssgAux.h \
ssgaShapes.h \
@@ -13,7 +13,7 @@
ssgaFire.h \
ssgaBillboards.h
-libplibssgaux_a_SOURCES = ssgAux.cxx \
+libplibssgaux_la_SOURCES = ssgAux.cxx \
ssgaShapes.cxx \
ssgaPatch.cxx \
ssgaParticleSystem.cxx \
@@ -30,6 +30,9 @@
ssgaSky.cxx \
ssgaTeapot.cxx \
ssgaBillboards.cxx
+libplibssgaux_la_LIBADD = ../util/libplibul.la ../ssg/libplibssg.la \
+ ../sg/libplibsg.la
+libplibssgaux_la_LDFLAGS = -version-info 9:5:8
INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/ssg
INCLUDES += -I$(top_srcdir)/src/util
diff -Naur plib-1.8.5.orig/src/util/Makefile.am plib-1.8.5/src/util/Makefile.am
--- plib-1.8.5.orig/src/util/Makefile.am 2008-04-17 13:46:45.000000000 +0100
+++ plib-1.8.5/src/util/Makefile.am 2008-04-17 14:13:41.000000000 +0100
@@ -1,11 +1,12 @@
if BUILD_UL
-lib_LIBRARIES = libplibul.a
+lib_LTLIBRARIES = libplibul.la
include_HEADERS = ul.h ulRTTI.h
-libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
+libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
ulList.cxx ulLocal.h ulRTTI.cxx
+libplibul_la_LDFLAGS = -version-info 9:5:8
endif
|
