123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289 |
- 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
-
|