02_build_shared_libs.diff 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289
  1. diff -Naur plib-1.8.5.orig/configure.in plib-1.8.5/configure.in
  2. --- plib-1.8.5.orig/configure.in 2008-04-17 13:46:45.000000000 +0100
  3. +++ plib-1.8.5/configure.in 2008-04-17 13:47:10.000000000 +0100
  4. @@ -36,7 +36,7 @@
  5. AC_PROG_CXX
  6. AC_PROG_CXXCPP
  7. AC_PROG_INSTALL
  8. -AC_PROG_RANLIB
  9. +AC_PROG_LIBTOOL
  10. dnl Command line arguments
  11. diff -Naur plib-1.8.5.orig/src/fnt/Makefile.am plib-1.8.5/src/fnt/Makefile.am
  12. --- plib-1.8.5.orig/src/fnt/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  13. +++ plib-1.8.5/src/fnt/Makefile.am 2008-04-17 13:52:53.000000000 +0100
  14. @@ -1,10 +1,12 @@
  15. if BUILD_FNT
  16. -lib_LIBRARIES = libplibfnt.a
  17. +lib_LTLIBRARIES = libplibfnt.la
  18. include_HEADERS = fnt.h
  19. -libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
  20. +libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
  21. +libplibfnt_la_LIBADD = ../util/libplibul.la
  22. +libplibfnt_la_LDFLAGS = -version-info 9:5:8
  23. INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
  24. diff -Naur plib-1.8.5.orig/src/js/Makefile.am plib-1.8.5/src/js/Makefile.am
  25. --- plib-1.8.5.orig/src/js/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  26. +++ plib-1.8.5/src/js/Makefile.am 2008-04-17 13:53:33.000000000 +0100
  27. @@ -1,12 +1,15 @@
  28. if BUILD_JS
  29. -lib_LIBRARIES = libplibjs.a
  30. +lib_LTLIBRARIES = libplibjs.la
  31. include_HEADERS = js.h
  32. -libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
  33. +libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
  34. jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \
  35. jsNone.cxx
  36. +libplibjs_la_LIBADD = ../util/libplibul.la
  37. +libplibjs_la_LDFLAGS = -version-info 9:5:8
  38. +
  39. INCLUDES = -I$(top_srcdir)/src/util
  40. diff -Naur plib-1.8.5.orig/src/Makefile.am plib-1.8.5/src/Makefile.am
  41. --- plib-1.8.5.orig/src/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  42. +++ plib-1.8.5/src/Makefile.am 2008-04-17 14:16:21.000000000 +0100
  43. @@ -1 +1 @@
  44. -SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw
  45. +SUBDIRS = util fnt sg js sl pui puAux ssg ssgAux net psl pw
  46. diff -Naur plib-1.8.5.orig/src/net/Makefile.am plib-1.8.5/src/net/Makefile.am
  47. --- plib-1.8.5.orig/src/net/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  48. +++ plib-1.8.5/src/net/Makefile.am 2008-04-17 13:54:12.000000000 +0100
  49. @@ -1,12 +1,14 @@
  50. if BUILD_NET
  51. -lib_LIBRARIES = libplibnet.a
  52. +lib_LTLIBRARIES = libplibnet.la
  53. include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \
  54. netMonitor.h netSocket.h net.h
  55. -libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
  56. +libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
  57. netMessage.cxx netMonitor.cxx netSocket.cxx
  58. +libplibnet_la_LIBADD = ../util/libplibul.la
  59. +libplibnet_la_LDFLAGS = -version-info 9:5:8
  60. INCLUDES = -I$(top_srcdir)/src/util
  61. diff -Naur plib-1.8.5.orig/src/psl/Makefile.am plib-1.8.5/src/psl/Makefile.am
  62. --- plib-1.8.5.orig/src/psl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  63. +++ plib-1.8.5/src/psl/Makefile.am 2008-04-17 14:13:43.000000000 +0100
  64. @@ -1,16 +1,18 @@
  65. if BUILD_PSL
  66. -lib_LIBRARIES = libplibpsl.a
  67. +lib_LTLIBRARIES = libplibpsl.la
  68. include_HEADERS = psl.h
  69. -libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
  70. +libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
  71. pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
  72. pslExpression.cxx pslProgram.cxx pslDump.cxx \
  73. pslError.cxx pslFileIO.cxx pslCompiler.h \
  74. pslContext.h pslFileIO.h pslLocal.h \
  75. pslOpcodes.h pslSymbol.h
  76. +libplibpsl_la_LIBADD = ../util/libplibul.la
  77. +libplibpsl_la_LDFLAGS = -version-info 9:5:8
  78. INCLUDES = -I$(top_srcdir)/src/util
  79. diff -Naur plib-1.8.5.orig/src/puAux/Makefile.am plib-1.8.5/src/puAux/Makefile.am
  80. --- plib-1.8.5.orig/src/puAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  81. +++ plib-1.8.5/src/puAux/Makefile.am 2008-04-17 14:08:34.000000000 +0100
  82. @@ -1,10 +1,10 @@
  83. if BUILD_PUAUX
  84. -lib_LIBRARIES = libplibpuaux.a
  85. +lib_LTLIBRARIES = libplibpuaux.la
  86. include_HEADERS = puAux.h puAuxLocal.h
  87. -libplibpuaux_a_SOURCES = puAux.cxx \
  88. +libplibpuaux_la_SOURCES = puAux.cxx \
  89. puAuxBiSlider.cxx \
  90. puAuxBiSliderWithEnds.cxx \
  91. puAuxComboBox.cxx \
  92. @@ -19,6 +19,9 @@
  93. puAuxTriSlider.cxx \
  94. puAuxVerticalMenu.cxx \
  95. puAuxChooser.cxx
  96. +libplibpuaux_la_LIBADD = ../util/libplibul.la ../pui/libplibpu.la \
  97. + ../fnt/libplibfnt.la ../sg/libplibsg.la
  98. +libplibpuaux_la_LDFLAGS = -version-info 9:5:8
  99. INCLUDES = -I$(top_srcdir)/src/sg \
  100. -I$(top_srcdir)/src/pui \
  101. diff -Naur plib-1.8.5.orig/src/pui/Makefile.am plib-1.8.5/src/pui/Makefile.am
  102. --- plib-1.8.5.orig/src/pui/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  103. +++ plib-1.8.5/src/pui/Makefile.am 2008-04-17 14:09:12.000000000 +0100
  104. @@ -1,10 +1,10 @@
  105. if BUILD_PUI
  106. -lib_LIBRARIES = libplibpu.a
  107. +lib_LTLIBRARIES = libplibpu.la
  108. include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h
  109. -libplibpu_a_SOURCES = \
  110. +libplibpu_la_SOURCES = \
  111. pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \
  112. puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \
  113. puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \
  114. @@ -14,6 +14,8 @@
  115. puDial.cxx \
  116. puRange.cxx \
  117. puInputBase.cxx
  118. +libplibpu_la_LIBADD = ../util/libplibul.la ../fnt/libplibfnt.la
  119. +libplibpu_la_LDFLAGS = -version-info 9:5:8
  120. AM_CPPFLAGS = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/fnt
  121. AM_CPPFLAGS += -I$(top_srcdir)/src/util
  122. diff -Naur plib-1.8.5.orig/src/pw/Makefile.am plib-1.8.5/src/pw/Makefile.am
  123. --- plib-1.8.5.orig/src/pw/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  124. +++ plib-1.8.5/src/pw/Makefile.am 2008-04-17 14:13:46.000000000 +0100
  125. @@ -1,10 +1,11 @@
  126. if BUILD_PW
  127. -lib_LIBRARIES = libplibpw.a
  128. +lib_LTLIBRARIES = libplibpw.la
  129. include_HEADERS = pw.h
  130. -libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
  131. +libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
  132. +libplibpw_la_LDFLAGS = -version-info 9:5:8
  133. INCLUDES = -I$(top_srcdir)/src/util
  134. diff -Naur plib-1.8.5.orig/src/sg/Makefile.am plib-1.8.5/src/sg/Makefile.am
  135. --- plib-1.8.5.orig/src/sg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  136. +++ plib-1.8.5/src/sg/Makefile.am 2008-04-17 14:14:23.000000000 +0100
  137. @@ -1,12 +1,14 @@
  138. if BUILD_SG
  139. -lib_LIBRARIES = libplibsg.a
  140. +lib_LTLIBRARIES = libplibsg.la
  141. include_HEADERS = sg.h
  142. -libplibsg_a_SOURCES = sg.cxx sgd.cxx \
  143. +libplibsg_la_SOURCES = sg.cxx sgd.cxx \
  144. sgIsect.cxx sgdIsect.cxx \
  145. sgPerlinNoise.cxx
  146. +libplibsg_la_LIBADD = ../util/libplibul.la
  147. +libplibsg_la_LDFLAGS = -version-info 9:5:8
  148. INCLUDES = -I$(top_srcdir)/src/util
  149. diff -Naur plib-1.8.5.orig/src/sl/Makefile.am plib-1.8.5/src/sl/Makefile.am
  150. --- plib-1.8.5.orig/src/sl/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  151. +++ plib-1.8.5/src/sl/Makefile.am 2008-04-17 14:12:02.000000000 +0100
  152. @@ -1,16 +1,19 @@
  153. if BUILD_SL
  154. -lib_LIBRARIES = libplibsl.a libplibsm.a
  155. +lib_LTLIBRARIES = libplibsl.la libplibsm.la
  156. include_HEADERS = sl.h slPortability.h sm.h
  157. -libplibsl_a_SOURCES = \
  158. +libplibsl_la_SOURCES = \
  159. slDSP.cxx slSample.cxx slEnvelope.cxx \
  160. slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
  161. slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
  162. slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
  163. +libplibsl_la_LIBADD = ../util/libplibul.la
  164. +libplibsl_la_LDFLAGS = -version-info 9:5:8
  165. -libplibsm_a_SOURCES = slPortability.h smMixer.cxx
  166. +libplibsm_la_SOURCES = slPortability.h smMixer.cxx
  167. +libplibsm_la_LDFLAGS = -version-info 9:5:8
  168. INCLUDES = -I$(top_srcdir)/src/util
  169. diff -Naur plib-1.8.5.orig/src/ssg/Makefile.am plib-1.8.5/src/ssg/Makefile.am
  170. --- plib-1.8.5.orig/src/ssg/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  171. +++ plib-1.8.5/src/ssg/Makefile.am 2008-04-17 14:15:18.000000000 +0100
  172. @@ -1,10 +1,10 @@
  173. if BUILD_SSG
  174. -lib_LIBRARIES = libplibssg.a
  175. +lib_LTLIBRARIES = libplibssg.la
  176. include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h
  177. -libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
  178. +libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
  179. ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \
  180. ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \
  181. ssgLoadDOF.cxx ssgLoadAC.cxx \
  182. @@ -28,6 +28,8 @@
  183. ssgLoadMDL_BGLTexture.cxx ssgLoadXPlaneObj.cxx ssgLoadASC.cxx ssgSaveASC.cxx \
  184. ssgSaveIV.cxx ssgAnimTransform.cxx\
  185. ssgVertSplitter.h ssgVertSplitter.cxx ssgStatistics.cxx
  186. +libplibssg_la_LIBADD = ../util/libplibul.la ../sg/libplibsg.la
  187. +libplibssg_la_LDFLAGS = -version-info 9:5:8
  188. INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
  189. diff -Naur plib-1.8.5.orig/src/ssgAux/Makefile.am plib-1.8.5/src/ssgAux/Makefile.am
  190. --- plib-1.8.5.orig/src/ssgAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  191. +++ plib-1.8.5/src/ssgAux/Makefile.am 2008-04-17 14:14:50.000000000 +0100
  192. @@ -1,6 +1,6 @@
  193. if BUILD_SSGAUX
  194. -lib_LIBRARIES = libplibssgaux.a
  195. +lib_LTLIBRARIES = libplibssgaux.la
  196. include_HEADERS = ssgAux.h \
  197. ssgaShapes.h \
  198. @@ -13,7 +13,7 @@
  199. ssgaFire.h \
  200. ssgaBillboards.h
  201. -libplibssgaux_a_SOURCES = ssgAux.cxx \
  202. +libplibssgaux_la_SOURCES = ssgAux.cxx \
  203. ssgaShapes.cxx \
  204. ssgaPatch.cxx \
  205. ssgaParticleSystem.cxx \
  206. @@ -30,6 +30,9 @@
  207. ssgaSky.cxx \
  208. ssgaTeapot.cxx \
  209. ssgaBillboards.cxx
  210. +libplibssgaux_la_LIBADD = ../util/libplibul.la ../ssg/libplibssg.la \
  211. + ../sg/libplibsg.la
  212. +libplibssgaux_la_LDFLAGS = -version-info 9:5:8
  213. INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/ssg
  214. INCLUDES += -I$(top_srcdir)/src/util
  215. diff -Naur plib-1.8.5.orig/src/util/Makefile.am plib-1.8.5/src/util/Makefile.am
  216. --- plib-1.8.5.orig/src/util/Makefile.am 2008-04-17 13:46:45.000000000 +0100
  217. +++ plib-1.8.5/src/util/Makefile.am 2008-04-17 14:13:41.000000000 +0100
  218. @@ -1,11 +1,12 @@
  219. if BUILD_UL
  220. -lib_LIBRARIES = libplibul.a
  221. +lib_LTLIBRARIES = libplibul.la
  222. include_HEADERS = ul.h ulRTTI.h
  223. -libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
  224. +libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
  225. ulList.cxx ulLocal.h ulRTTI.cxx
  226. +libplibul_la_LDFLAGS = -version-info 9:5:8
  227. endif