SimGear-shared.patch

   1 diff -Naur SimGear-0.2.0/configure.ac SimGear-0.2.0-p/configure.ac
   2 --- SimGear-0.2.0/configure.ac  Sat Sep  7 03:25:02 2002
   3 +++ SimGear-0.2.0-p/configure.ac        Fri Sep 13 08:12:18 2002
   4 @@ -34,7 +34,7 @@
   5  AC_PROG_CC
   6  AC_PROG_CPP
   7  AC_PROG_CXX
   8 -AC_PROG_RANLIB
   9 +AC_PROG_LIBTOOL
  10  AC_PROG_INSTALL
  11  AC_PROG_LN_S
  12
  13 diff -Naur SimGear-0.2.0/simgear/Makefile.am SimGear-0.2.0-p/simgear/Makefile.am
  14 --- SimGear-0.2.0/simgear/Makefile.am   Mon Sep  2 05:42:51 2002
  15 +++ SimGear-0.2.0-p/simgear/Makefile.am Fri Sep 13 08:21:08 2002
  16 @@ -18,13 +18,13 @@
  17         misc \
  18         bucket \
  19         ephemeris \
  20 +       serial \
  21         io \
  22         magvar \
  23         math \
  24         $(METAR_DIRS) \
  25         route \
  26         screen \
  27 -       serial \
  28         sky \
  29         $(SGTHREAD_DIR) \
  30         timing \
  31 diff -Naur SimGear-0.2.0/simgear/bucket/Makefile.am SimGear-0.2.0-p/simgear/bucket/Makefile.am
  32 --- SimGear-0.2.0/simgear/bucket/Makefile.am    Sun Aug 25 19:24:15 2002
  33 +++ SimGear-0.2.0-p/simgear/bucket/Makefile.am  Fri Sep 13 08:13:01 2002
  34 @@ -1,10 +1,10 @@
  35  includedir = @includedir@/bucket
  36
  37 -lib_LIBRARIES = libsgbucket.a
  38 +lib_LTLIBRARIES = libsgbucket.la
  39
  40  include_HEADERS = newbucket.hxx
  41
  42 -libsgbucket_a_SOURCES = newbucket.cxx
  43 +libsgbucket_la_SOURCES = newbucket.cxx
  44
  45  # noinst_PROGRAMS = testbucket
  46
  47 diff -Naur SimGear-0.2.0/simgear/debug/Makefile.am SimGear-0.2.0-p/simgear/debug/Makefile.am
  48 --- SimGear-0.2.0/simgear/debug/Makefile.am     Sun Aug 25 19:24:20 2002
  49 +++ SimGear-0.2.0-p/simgear/debug/Makefile.am   Fri Sep 13 08:13:24 2002
  50 @@ -2,10 +2,10 @@
  51
  52  EXTRA_DIST = logtest.cxx
  53
  54 -lib_LIBRARIES = libsgdebug.a
  55 +lib_LTLIBRARIES = libsgdebug.la
  56
  57  include_HEADERS = debug_types.h logstream.hxx
  58
  59 -libsgdebug_a_SOURCES = logstream.cxx
  60 +libsgdebug_la_SOURCES = logstream.cxx
  61
  62  INCLUDES = -I$(top_srcdir)
  63 diff -Naur SimGear-0.2.0/simgear/ephemeris/Makefile.am SimGear-0.2.0-p/simgear/ephemeris/Makefile.am
  64 --- SimGear-0.2.0/simgear/ephemeris/Makefile.am Sun Aug 25 19:24:27 2002
  65 +++ SimGear-0.2.0-p/simgear/ephemeris/Makefile.am       Fri Sep 13 08:13:39 2002
  66 @@ -1,6 +1,6 @@
  67  includedir = @includedir@/ephemeris
  68
  69 -lib_LIBRARIES = libsgephem.a
  70 +lib_LTLIBRARIES = libsgephem.la
  71
  72  include_HEADERS = \
  73         celestialBody.hxx \
  74 @@ -16,7 +16,7 @@
  75         uranus.hxx \
  76         venus.hxx
  77
  78 -libsgephem_a_SOURCES = \
  79 +libsgephem_la_SOURCES = \
  80         celestialBody.cxx \
  81         ephemeris.cxx \
  82         jupiter.cxx \
  83 diff -Naur SimGear-0.2.0/simgear/io/Makefile.am SimGear-0.2.0-p/simgear/io/Makefile.am
  84 --- SimGear-0.2.0/simgear/io/Makefile.am        Sat Sep  7 01:13:31 2002
  85 +++ SimGear-0.2.0-p/simgear/io/Makefile.am      Fri Sep 13 08:15:47 2002
  86 @@ -1,6 +1,6 @@
  87  includedir = @includedir@/io
  88
  89 -lib_LIBRARIES = libsgio.a
  90 +lib_LTLIBRARIES = libsgio.la
  91
  92  include_HEADERS = \
  93         iochannel.hxx \
  94 @@ -11,7 +11,7 @@
  95         sg_socket.hxx \
  96         sg_socket_udp.hxx
  97
  98 -libsgio_a_SOURCES = \
  99 +libsgio_la_SOURCES = \
 100         iochannel.cxx \
 101         lowlevel.cxx \
 102         sg_binobj.cxx \
 103 @@ -53,24 +53,32 @@
 104  socktest_SOURCES = socktest.cxx
 105
 106  socktest_LDADD = \
 107 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 108 -        $(top_builddir)/simgear/io/libsgio.a \
 109 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 110 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 111 -       $(top_builddir)/simgear/xml/libsgxml.a \
 112 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 113 +        $(top_builddir)/simgear/io/libsgio.la \
 114 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 115 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 116 +       $(top_builddir)/simgear/xml/libsgxml.la \
 117 +       $(top_builddir)/simgear/serial/libsgserial.la \
 118         -lplibnet -lplibul -lz $(NETWORK_LIB)
 119
 120  lowtest_SOURCES = lowtest.cxx
 121
 122  lowtest_LDADD = \
 123 -       $(top_builddir)/simgear/io/libsgio.a
 124 +       $(top_builddir)/simgear/io/libsgio.la \
 125 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 126 +       $(top_builddir)/simgear/serial/libsgserial.la \
 127 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 128 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 129 +       $(top_builddir)/simgear/xml/libsgxml.la \
 130 +       -lplibnet -lplibul -lz $(NETWORK_LIB)
 131
 132  decode_binobj_SOURCES = decode_binobj.cxx
 133
 134  decode_binobj_LDADD = \
 135 -       $(top_builddir)/simgear/io/libsgio.a \
 136 -        $(top_builddir)/simgear/bucket/libsgbucket.a \
 137 -        $(top_builddir)/simgear/misc/libsgmisc.a \
 138 -        $(top_builddir)/simgear/debug/libsgdebug.a \
 139 -       $(top_builddir)/simgear/xml/libsgxml.a \
 140 -       -lz
 141 +       $(top_builddir)/simgear/io/libsgio.la \
 142 +        $(top_builddir)/simgear/bucket/libsgbucket.la \
 143 +        $(top_builddir)/simgear/misc/libsgmisc.la \
 144 +        $(top_builddir)/simgear/debug/libsgdebug.la \
 145 +       $(top_builddir)/simgear/xml/libsgxml.la \
 146 +       $(top_builddir)/simgear/serial/libsgserial.la \
 147 +       $(NETWORK_LIB) -lz -lplibnet
 148 diff -Naur SimGear-0.2.0/simgear/magvar/Makefile.am SimGear-0.2.0-p/simgear/magvar/Makefile.am
 149 --- SimGear-0.2.0/simgear/magvar/Makefile.am    Sun Aug 25 19:24:53 2002
 150 +++ SimGear-0.2.0-p/simgear/magvar/Makefile.am  Fri Sep 13 08:16:10 2002
 151 @@ -1,10 +1,10 @@
 152  includedir = @includedir@/magvar
 153
 154 -lib_LIBRARIES = libsgmagvar.a
 155 +lib_LTLIBRARIES = libsgmagvar.la
 156
 157  include_HEADERS = magvar.hxx
 158
 159 -libsgmagvar_a_SOURCES = \
 160 +libsgmagvar_la_SOURCES = \
 161         coremag.hxx coremag.cxx \
 162         magvar.cxx
 163
 164 @@ -12,6 +12,6 @@
 165
 166  testmagvar_SOURCES = testmagvar.cxx
 167
 168 -testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
 169 +testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.la
 170
 171  INCLUDES = -I$(top_srcdir)
 172 diff -Naur SimGear-0.2.0/simgear/math/Makefile.am SimGear-0.2.0-p/simgear/math/Makefile.am
 173 --- SimGear-0.2.0/simgear/math/Makefile.am      Sun Aug 25 19:25:01 2002
 174 +++ SimGear-0.2.0-p/simgear/math/Makefile.am    Fri Sep 13 08:16:39 2002
 175 @@ -1,6 +1,6 @@
 176  includedir = @includedir@/math
 177
 178 -lib_LIBRARIES = libsgmath.a
 179 +lib_LTLIBRARIES = libsgmath.la
 180
 181  include_HEADERS = \
 182         interpolater.hxx \
 183 @@ -16,7 +16,7 @@
 184
 185  EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
 186
 187 -libsgmath_a_SOURCES = \
 188 +libsgmath_la_SOURCES = \
 189         interpolater.cxx \
 190         leastsqs.cxx \
 191         polar3d.cxx \
 192 diff -Naur SimGear-0.2.0/simgear/metar/Makefile.am SimGear-0.2.0-p/simgear/metar/Makefile.am
 193 --- SimGear-0.2.0/simgear/metar/Makefile.am     Sun Aug 25 19:25:07 2002
 194 +++ SimGear-0.2.0-p/simgear/metar/Makefile.am   Fri Sep 13 08:16:56 2002
 195 @@ -1,10 +1,10 @@
 196  includedir = @includedir@/metar
 197
 198 -lib_LIBRARIES = libsgmetar.a
 199 +lib_LTLIBRARIES = libsgmetar.la
 200
 201  include_HEADERS = MetarReport.h MetarStation.h
 202
 203 -libsgmetar_a_SOURCES = \
 204 +libsgmetar_la_SOURCES = \
 205         Antoi.cpp Charcmp.cpp Dcdmetar.cpp Dcdmtrmk.cpp Drvmetar.c \
 206         Fracpart.cpp Local.h Metar.h \
 207         MetarReport.cpp \
 208 diff -Naur SimGear-0.2.0/simgear/misc/Makefile.am SimGear-0.2.0-p/simgear/misc/Makefile.am
 209 --- SimGear-0.2.0/simgear/misc/Makefile.am      Sun Aug 25 19:25:13 2002
 210 +++ SimGear-0.2.0-p/simgear/misc/Makefile.am    Fri Sep 13 08:17:36 2002
 211 @@ -1,6 +1,6 @@
 212  includedir = @includedir@/misc
 213
 214 -lib_LIBRARIES = libsgmisc.a
 215 +lib_LTLIBRARIES = libsgmisc.la
 216
 217  include_HEADERS = \
 218          commands.hxx \
 219 @@ -14,7 +14,7 @@
 220         texcoord.hxx \
 221         zfstream.hxx
 222
 223 -libsgmisc_a_SOURCES = \
 224 +libsgmisc_la_SOURCES = \
 225          commands.cxx \
 226          exception.cxx \
 227         props.cxx \
 228 @@ -28,6 +28,6 @@
 229  noinst_PROGRAMS = props_test
 230
 231  props_test_SOURCES = props_test.cxx
 232 -props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
 233 +props_test_LDADD = libsgmisc.la ../xml/libsgxml.la ../debug/libsgdebug.la -lz
 234
 235  INCLUDES = -I$(top_srcdir)
 236 diff -Naur SimGear-0.2.0/simgear/route/Makefile.am SimGear-0.2.0-p/simgear/route/Makefile.am
 237 --- SimGear-0.2.0/simgear/route/Makefile.am     Sun Aug 25 19:25:18 2002
 238 +++ SimGear-0.2.0-p/simgear/route/Makefile.am   Fri Sep 13 08:18:32 2002
 239 @@ -1,10 +1,10 @@
 240  includedir = @includedir@/route
 241
 242 -lib_LIBRARIES = libsgroute.a
 243 +lib_LTLIBRARIES = libsgroute.la
 244
 245  include_HEADERS = route.hxx waypoint.hxx
 246
 247 -libsgroute_a_SOURCES = \
 248 +libsgroute_la_SOURCES = \
 249         route.cxx \
 250         waypoint.cxx
 251
 252 @@ -15,16 +15,19 @@
 253  waytest_SOURCES = waytest.cxx
 254
 255  waytest_LDADD = \
 256 -       $(top_builddir)/simgear/route/libsgroute.a \
 257 -       $(top_builddir)/simgear/math/libsgmath.a \
 258 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 259 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 260 -       $(top_builddir)/simgear/xml/libsgxml.a \
 261 +       $(top_builddir)/simgear/route/libsgroute.la \
 262 +       $(top_builddir)/simgear/math/libsgmath.la \
 263 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 264 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 265 +       $(top_builddir)/simgear/xml/libsgxml.la \
 266         -lz
 267
 268  routetest_SOURCES = routetest.cxx
 269
 270  routetest_LDADD = \
 271 -       $(top_builddir)/simgear/route/libsgroute.a \
 272 -       $(top_builddir)/simgear/math/libsgmath.a \
 273 -       $(top_builddir)/simgear/debug/libsgdebug.a
 274 +       $(top_builddir)/simgear/route/libsgroute.la \
 275 +       $(top_builddir)/simgear/math/libsgmath.la \
 276 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 277 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 278 +       $(top_builddir)/simgear/xml/libsgxml.la \
 279 +       -lz
 280 diff -Naur SimGear-0.2.0/simgear/screen/Makefile.am SimGear-0.2.0-p/simgear/screen/Makefile.am
 281 --- SimGear-0.2.0/simgear/screen/Makefile.am    Sun Aug 25 19:25:25 2002
 282 +++ SimGear-0.2.0-p/simgear/screen/Makefile.am  Fri Sep 13 08:18:51 2002
 283 @@ -1,6 +1,6 @@
 284  includedir = @includedir@/screen
 285
 286 -lib_LIBRARIES = libsgscreen.a
 287 +lib_LTLIBRARIES = libsgscreen.la
 288
 289  if ENABLE_JPEG_SERVER
 290  IMAGE_SERVER_INCL = jpgfactory.hxx
 291 @@ -12,7 +12,7 @@
 292
 293  include_HEADERS = $(IMAGE_SERVER_INCL) screen-dump.hxx tr.h
 294
 295 -libsgscreen_a_SOURCES = \
 296 +libsgscreen_la_SOURCES = \
 297         GLBitmaps.cxx GLBitmaps.h \
 298         $(IMAGE_SERVER_SRCS) \
 299         screen-dump.cxx \
 300 diff -Naur SimGear-0.2.0/simgear/serial/Makefile.am SimGear-0.2.0-p/simgear/serial/Makefile.am
 301 --- SimGear-0.2.0/simgear/serial/Makefile.am    Sat Sep  7 02:40:38 2002
 302 +++ SimGear-0.2.0-p/simgear/serial/Makefile.am  Fri Sep 13 08:19:16 2002
 303 @@ -1,17 +1,17 @@
 304  includedir = @includedir@/serial
 305
 306 -lib_LIBRARIES = libsgserial.a
 307 +lib_LTLIBRARIES = libsgserial.la
 308
 309  include_HEADERS = serial.hxx
 310
 311 -libsgserial_a_SOURCES = serial.cxx
 312 +libsgserial_la_SOURCES = serial.cxx
 313
 314  noinst_PROGRAMS = testserial
 315
 316  testserial_SOURCES = testserial.cxx
 317
 318  testserial_LDADD = \
 319 -       $(top_builddir)/simgear/serial/libsgserial.a \
 320 -       $(top_builddir)/simgear/debug/libsgdebug.a
 321 +       $(top_builddir)/simgear/serial/libsgserial.la \
 322 +       $(top_builddir)/simgear/debug/libsgdebug.la
 323
 324  INCLUDES = -I$(top_srcdir)
 325 diff -Naur SimGear-0.2.0/simgear/sky/Makefile.am SimGear-0.2.0-p/simgear/sky/Makefile.am
 326 --- SimGear-0.2.0/simgear/sky/Makefile.am       Sun Aug 25 19:25:35 2002
 327 +++ SimGear-0.2.0-p/simgear/sky/Makefile.am     Fri Sep 13 08:19:31 2002
 328 @@ -1,6 +1,6 @@
 329  includedir = @includedir@/sky
 330
 331 -lib_LIBRARIES = libsgsky.a
 332 +lib_LTLIBRARIES = libsgsky.la
 333
 334  include_HEADERS = \
 335         cloud.hxx \
 336 @@ -11,7 +11,7 @@
 337         sphere.hxx \
 338         stars.hxx
 339
 340 -libsgsky_a_SOURCES = \
 341 +libsgsky_la_SOURCES = \
 342         cloud.cxx \
 343         dome.cxx \
 344         moon.cxx \
 345 diff -Naur SimGear-0.2.0/simgear/threads/Makefile.am SimGear-0.2.0-p/simgear/threads/Makefile.am
 346 --- SimGear-0.2.0/simgear/threads/Makefile.am   Sun Aug 25 19:25:39 2002
 347 +++ SimGear-0.2.0-p/simgear/threads/Makefile.am Fri Sep 13 08:20:32 2002
 348 @@ -1,13 +1,13 @@
 349  includedir = @includedir@/threads
 350
 351 -lib_LIBRARIES = libsgthreads.a
 352 +lib_LTLIBRARIES = libsgthreads.la
 353
 354  include_HEADERS = \
 355         SGGuard.hxx \
 356         SGQueue.hxx \
 357         SGThread.hxx
 358
 359 -libsgthreads_a_SOURCES = \
 360 +libsgthreads_la_SOURCES = \
 361         SGThread.cxx
 362
 363  INCLUDES = -I$(top_srcdir)
 364 diff -Naur SimGear-0.2.0/simgear/timing/Makefile.am SimGear-0.2.0-p/simgear/timing/Makefile.am
 365 --- SimGear-0.2.0/simgear/timing/Makefile.am    Sun Aug 25 19:25:43 2002
 366 +++ SimGear-0.2.0-p/simgear/timing/Makefile.am  Fri Sep 13 08:19:41 2002
 367 @@ -1,6 +1,6 @@
 368  includedir = @includedir@/timing
 369
 370 -lib_LIBRARIES = libsgtiming.a
 371 +lib_LTLIBRARIES = libsgtiming.la
 372
 373  include_HEADERS = \
 374         geocoord.h \
 375 @@ -9,7 +9,7 @@
 376         timestamp.hxx \
 377         timezone.h
 378
 379 -libsgtiming_a_SOURCES = \
 380 +libsgtiming_la_SOURCES = \
 381         geocoord.cxx \
 382         lowleveltime.cxx \
 383         sg_time.cxx \
 384 diff -Naur SimGear-0.2.0/simgear/xgl/Makefile.am SimGear-0.2.0-p/simgear/xgl/Makefile.am
 385 --- SimGear-0.2.0/simgear/xgl/Makefile.am       Sun Aug 25 19:25:47 2002
 386 +++ SimGear-0.2.0-p/simgear/xgl/Makefile.am     Fri Sep 13 08:20:05 2002
 387 @@ -1,9 +1,9 @@
 388  includedir = @includedir@/xgl
 389
 390 -lib_LIBRARIES = libsgxgl.a
 391 +lib_LTLIBRARIES = libsgxgl.la
 392
 393  include_HEADERS = xgl.h
 394
 395 -libsgxgl_a_SOURCES = xgl.c xglUtils.c
 396 +libsgxgl_la_SOURCES = xgl.c xglUtils.c
 397
 398  INCLUDES = -I$(top_srcdir)
 399 diff -Naur SimGear-0.2.0/simgear/xml/Makefile.am SimGear-0.2.0-p/simgear/xml/Makefile.am
 400 --- SimGear-0.2.0/simgear/xml/Makefile.am       Sun Aug 25 19:25:52 2002
 401 +++ SimGear-0.2.0-p/simgear/xml/Makefile.am     Fri Sep 13 08:20:15 2002
 402 @@ -1,6 +1,6 @@
 403  includedir = @includedir@/xml
 404
 405 -lib_LIBRARIES = libsgxml.a
 406 +lib_LTLIBRARIES = libsgxml.la
 407
 408  include_HEADERS = \
 409         easyxml.hxx
 410 @@ -8,7 +8,7 @@
 411  noinst_HEADERS = \
 412         xmltok_impl.c xmltok_ns.c
 413
 414 -libsgxml_a_SOURCES = \
 415 +libsgxml_la_SOURCES = \
 416          asciitab.h \
 417         easyxml.cxx \
 418         hashtable.h hashtable.c \
 419 diff -Naur SimGear-0.2.0/simgear/io/Makefile.am SimGear-0.2.0-p/simgear/io/Makefile.am
 420 --- SimGear-0.2.0/simgear/io/Makefile.am        Fri Sep 13 20:44:42 2002
 421 +++ SimGear-0.2.0-p/simgear/io/Makefile.am      Fri Sep 13 20:45:21 2002
 422 @@ -33,21 +33,23 @@
 423  tcp_server_SOURCES = tcp_server.cxx
 424
 425  tcp_server_LDADD = \
 426 -       $(top_builddir)/simgear/io/libsgio.a \
 427 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 428 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 429 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 430 -       $(top_builddir)/simgear/xml/libsgxml.a \
 431 +       $(top_builddir)/simgear/io/libsgio.la \
 432 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 433 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 434 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 435 +       $(top_builddir)/simgear/xml/libsgxml.la \
 436 +       $(top_builddir)/simgear/serial/libsgserial.la \
 437         -lplibnet -lplibul -lz $(NETWORK_LIB)
 438
 439  tcp_client_SOURCES = tcp_client.cxx
 440
 441  tcp_client_LDADD = \
 442 -       $(top_builddir)/simgear/io/libsgio.a \
 443 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 444 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 445 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 446 -        $(top_builddir)/simgear/xml/libsgxml.a \
 447 +       $(top_builddir)/simgear/io/libsgio.la \
 448 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 449 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 450 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 451 +        $(top_builddir)/simgear/xml/libsgxml.la \
 452 +        $(top_builddir)/simgear/serial/libsgserial.la \
 453         -lplibnet -lplibul -lz $(NETWORK_LIB)
 454
 455  socktest_SOURCES = socktest.cxx