SimGear-shared.patch

   1 diff -uNr SimGear-1.9.1.orig/configure.ac SimGear-1.9.1/configure.ac
   2 --- SimGear-1.9.1.orig/configure.ac     2009-01-25 13:03:56.000000000 +0100
   3 +++ SimGear-1.9.1/configure.ac  2009-08-11 14:32:11.000000000 +0200
   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  AX_BOOST_BASE([1.34.0])
  13 diff -uNr SimGear-1.9.1.orig/simgear/bucket/Makefile.am SimGear-1.9.1/simgear/bucket/Makefile.am
  14 --- SimGear-1.9.1.orig/simgear/bucket/Makefile.am       2009-01-25 13:00:32.000000000 +0100
  15 +++ SimGear-1.9.1/simgear/bucket/Makefile.am    2009-08-11 14:32:11.000000000 +0200
  16 @@ -1,10 +1,10 @@
  17  includedir = @includedir@/bucket
  18
  19 -lib_LIBRARIES = libsgbucket.a
  20 +lib_LTLIBRARIES = libsgbucket.la
  21
  22  include_HEADERS = newbucket.hxx
  23
  24 -libsgbucket_a_SOURCES = newbucket.cxx
  25 +libsgbucket_la_SOURCES = newbucket.cxx
  26
  27  # noinst_PROGRAMS = testbucket
  28
  29 diff -uNr SimGear-1.9.1.orig/simgear/debug/Makefile.am SimGear-1.9.1/simgear/debug/Makefile.am
  30 --- SimGear-1.9.1.orig/simgear/debug/Makefile.am        2009-01-25 13:00:32.000000000 +0100
  31 +++ SimGear-1.9.1/simgear/debug/Makefile.am     2009-08-11 14:32:11.000000000 +0200
  32 @@ -2,10 +2,10 @@
  33
  34  EXTRA_DIST = logtest.cxx
  35
  36 -lib_LIBRARIES = libsgdebug.a
  37 +lib_LTLIBRARIES = libsgdebug.la
  38
  39  include_HEADERS = debug_types.h logstream.hxx
  40
  41 -libsgdebug_a_SOURCES = logstream.cxx
  42 +libsgdebug_la_SOURCES = logstream.cxx
  43
  44  INCLUDES = -I$(top_srcdir)
  45 diff -uNr SimGear-1.9.1.orig/simgear/environment/Makefile.am SimGear-1.9.1/simgear/environment/Makefile.am
  46 --- SimGear-1.9.1.orig/simgear/environment/Makefile.am  2009-01-25 13:00:32.000000000 +0100
  47 +++ SimGear-1.9.1/simgear/environment/Makefile.am       2009-08-11 14:32:11.000000000 +0200
  48 @@ -1,9 +1,9 @@
  49  includedir = @includedir@/environment
  50
  51 -lib_LIBRARIES = libsgenvironment.a
  52 +lib_LTLIBRARIES = libsgenvironment.la
  53
  54  include_HEADERS = metar.hxx visual_enviro.hxx precipitation.hxx
  55
  56 -libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
  57 +libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
  58
  59  INCLUDES = -I$(top_srcdir)
  60 diff -uNr SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am SimGear-1.9.1/simgear/ephemeris/Makefile.am
  61 --- SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am    2009-01-25 13:00:32.000000000 +0100
  62 +++ SimGear-1.9.1/simgear/ephemeris/Makefile.am 2009-08-11 14:32:11.000000000 +0200
  63 @@ -1,6 +1,6 @@
  64  includedir = @includedir@/ephemeris
  65
  66 -lib_LIBRARIES = libsgephem.a
  67 +lib_LTLIBRARIES = libsgephem.la
  68
  69  include_HEADERS = \
  70         celestialBody.hxx \
  71 @@ -16,7 +16,7 @@
  72         uranus.hxx \
  73         venus.hxx
  74
  75 -libsgephem_a_SOURCES = \
  76 +libsgephem_la_SOURCES = \
  77         celestialBody.cxx \
  78         ephemeris.cxx \
  79         jupiter.cxx \
  80 diff -uNr SimGear-1.9.1.orig/simgear/io/Makefile.am SimGear-1.9.1/simgear/io/Makefile.am
  81 --- SimGear-1.9.1.orig/simgear/io/Makefile.am   2009-01-25 13:00:32.000000000 +0100
  82 +++ SimGear-1.9.1/simgear/io/Makefile.am        2009-08-11 14:32:11.000000000 +0200
  83 @@ -1,6 +1,6 @@
  84  includedir = @includedir@/io
  85
  86 -lib_LIBRARIES = libsgio.a
  87 +lib_LTLIBRARIES = libsgio.la
  88
  89  include_HEADERS = \
  90         iochannel.hxx \
  91 @@ -11,7 +11,7 @@
  92         sg_socket.hxx \
  93         sg_socket_udp.hxx
  94
  95 -libsgio_a_SOURCES = \
  96 +libsgio_la_SOURCES = \
  97         iochannel.cxx \
  98         lowlevel.cxx \
  99         sg_binobj.cxx \
 100 @@ -27,10 +27,10 @@
 101  tcp_server_SOURCES = tcp_server.cxx
 102
 103  tcp_server_LDADD = \
 104 -       libsgio.a \
 105 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 106 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 107 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 108 +       libsgio.la \
 109 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 110 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 111 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 112         -lplibnet -lplibul -lz \
 113         $(network_LIBS) \
 114         $(base_LIBS)
 115 @@ -38,10 +38,10 @@
 116  tcp_client_SOURCES = tcp_client.cxx
 117
 118  tcp_client_LDADD = \
 119 -       libsgio.a \
 120 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 121 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 122 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 123 +       libsgio.la \
 124 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 125 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 126 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 127         -lplibnet -lplibul -lz \
 128         $(network_LIBS) \
 129         $(base_LIBS)
 130 @@ -49,10 +49,10 @@
 131  socktest_SOURCES = socktest.cxx
 132
 133  socktest_LDADD = \
 134 -       libsgio.a \
 135 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 136 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 137 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 138 +       libsgio.la \
 139 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 140 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 141 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 142         -lplibnet -lplibul -lz \
 143         $(network_LIBS) \
 144         $(base_LIBS)
 145 @@ -60,17 +60,17 @@
 146  lowtest_SOURCES = lowtest.cxx
 147
 148  lowtest_LDADD = \
 149 -       libsgio.a \
 150 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 151 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 152 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 153 +       libsgio.la \
 154 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 155 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 156 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 157         $(base_LIBS) -lz
 158
 159  decode_binobj_SOURCES = decode_binobj.cxx
 160
 161  decode_binobj_LDADD = \
 162 -       libsgio.a \
 163 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 164 -       $(top_builddir)/simgear/bucket/libsgbucket.a \
 165 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 166 +       libsgio.la \
 167 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 168 +       $(top_builddir)/simgear/bucket/libsgbucket.la \
 169 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 170         $(base_LIBS) -lz
 171 diff -uNr SimGear-1.9.1.orig/simgear/magvar/Makefile.am SimGear-1.9.1/simgear/magvar/Makefile.am
 172 --- SimGear-1.9.1.orig/simgear/magvar/Makefile.am       2009-01-25 13:00:32.000000000 +0100
 173 +++ SimGear-1.9.1/simgear/magvar/Makefile.am    2009-08-11 14:32:11.000000000 +0200
 174 @@ -1,10 +1,10 @@
 175  includedir = @includedir@/magvar
 176
 177 -lib_LIBRARIES = libsgmagvar.a
 178 +lib_LTLIBRARIES = libsgmagvar.la
 179
 180  include_HEADERS = magvar.hxx
 181
 182 -libsgmagvar_a_SOURCES = \
 183 +libsgmagvar_la_SOURCES = \
 184         coremag.hxx coremag.cxx \
 185         magvar.cxx
 186
 187 @@ -13,7 +13,7 @@
 188  testmagvar_SOURCES = testmagvar.cxx
 189
 190  testmagvar_LDADD = \
 191 -       libsgmagvar.a \
 192 +       libsgmagvar.la \
 193         $(base_LIBS)
 194
 195  INCLUDES = -I$(top_srcdir)
 196 diff -uNr SimGear-1.9.1.orig/simgear/Makefile.am SimGear-1.9.1/simgear/Makefile.am
 197 --- SimGear-1.9.1.orig/simgear/Makefile.am      2009-01-25 13:00:32.000000000 +0100
 198 +++ SimGear-1.9.1/simgear/Makefile.am   2009-08-11 14:33:26.000000000 +0200
 199 @@ -16,22 +16,22 @@
 200         $(compatibility_DIR) \
 201         xml \
 202         debug \
 203 -       misc \
 204 +       timing \
 205         structure \
 206 +       props \
 207 +       misc \
 208         bucket \
 209         ephemeris \
 210 +       serial \
 211         io \
 212         magvar \
 213         math \
 214         $(METAR_DIRS) \
 215         nasal \
 216 -       props \
 217         route \
 218         scene \
 219         screen \
 220 -       serial \
 221         sound \
 222 -       $(SGTHREAD_DIR) \
 223 -       timing
 224 +       $(SGTHREAD_DIR)
 225
 226  DIST_SUBDIRS = $(SUBDIRS) compatibility
 227 diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am SimGear-1.9.1/simgear/math/Makefile.am
 228 --- SimGear-1.9.1.orig/simgear/math/Makefile.am 2009-01-25 13:00:32.000000000 +0100
 229 +++ SimGear-1.9.1/simgear/math/Makefile.am      2009-08-11 14:32:11.000000000 +0200
 230 @@ -4,12 +4,12 @@
 231  TESTS           = $(check_PROGRAMS)
 232
 233  SGMathTest_SOURCES = SGMathTest.cxx
 234 -SGMathTest_LDADD = libsgmath.a $(base_LIBS)
 235 +SGMathTest_LDADD = libsgmath.la $(base_LIBS)
 236
 237  SGGeometryTest_SOURCES = SGGeometryTest.cxx
 238 -SGGeometryTest_LDADD = libsgmath.a $(base_LIBS)
 239 +SGGeometryTest_LDADD = libsgmath.la $(base_LIBS)
 240
 241 -lib_LIBRARIES = libsgmath.a
 242 +lib_LTLIBRARIES = libsgmath.la
 243
 244  include_HEADERS = \
 245         interpolater.hxx \
 246 @@ -44,7 +44,7 @@
 247         SGVec3.hxx \
 248         SGVec4.hxx
 249
 250 -libsgmath_a_SOURCES = \
 251 +libsgmath_la_SOURCES = \
 252         interpolater.cxx \
 253         leastsqs.cxx \
 254         sg_random.c \
 255 diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am SimGear-1.9.1/simgear/misc/Makefile.am
 256 --- SimGear-1.9.1.orig/simgear/misc/Makefile.am 2009-01-25 13:00:32.000000000 +0100
 257 +++ SimGear-1.9.1/simgear/misc/Makefile.am      2009-08-11 14:34:32.000000000 +0200
 258 @@ -1,6 +1,6 @@
 259  includedir = @includedir@/misc
 260
 261 -lib_LIBRARIES = libsgmisc.a
 262 +lib_LTLIBRARIES = libsgmisc.la
 263
 264  include_HEADERS = \
 265         sg_path.hxx \
 266 @@ -14,7 +14,7 @@
 267         stdint.hxx \
 268         PathOptions.hxx
 269
 270 -libsgmisc_a_SOURCES = \
 271 +libsgmisc_la_SOURCES = \
 272         sg_path.cxx \
 273         sgstream.cxx \
 274         strutils.cxx \
 275 @@ -28,15 +28,15 @@
 276
 277  tabbed_value_test_SOURCES = tabbed_values_test.cxx
 278  tabbed_value_test_LDADD = \
 279 -       libsgmisc.a \
 280 -       $(top_builddir)/simgear/xml/libsgxml.a \
 281 -       $(top_builddir)/simgear/debug/libsgdebug.a
 282 +       libsgmisc.la \
 283 +       $(top_builddir)/simgear/xml/libsgxml.la \
 284 +       $(top_builddir)/simgear/debug/libsgdebug.la
 285
 286  $(top_builddir)/simgear/xml/libsgxml.a:
 287 -       cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
 288 +       cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.la
 289
 290  $(top_builddir)/simgear/debug/libsgdebug.a:
 291 -       cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
 292 +       cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.la
 293
 294  swap_test_SOURCES = swap_test.cpp
 295
 296 diff -uNr SimGear-1.9.1.orig/simgear/nasal/Makefile.am SimGear-1.9.1/simgear/nasal/Makefile.am
 297 --- SimGear-1.9.1.orig/simgear/nasal/Makefile.am        2009-01-25 13:00:32.000000000 +0100
 298 +++ SimGear-1.9.1/simgear/nasal/Makefile.am     2009-08-11 14:32:11.000000000 +0200
 299 @@ -1,10 +1,10 @@
 300  includedir = @includedir@/nasal
 301
 302 -lib_LIBRARIES = libsgnasal.a
 303 +lib_LTLIBRARIES = libsgnasal.la
 304
 305  include_HEADERS = nasal.h naref.h
 306
 307 -libsgnasal_a_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c   \
 308 +libsgnasal_la_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c  \
 309                         hash.c iolib.c iolib.h lex.c lib.c mathlib.c    \
 310                         misc.c naref.h nasal.h parse.c parse.h string.c \
 311                         thread-posix.c thread-win32.c threadlib.c       \
 312 diff -uNr SimGear-1.9.1.orig/simgear/props/Makefile.am SimGear-1.9.1/simgear/props/Makefile.am
 313 --- SimGear-1.9.1.orig/simgear/props/Makefile.am        2009-01-25 13:00:32.000000000 +0100
 314 +++ SimGear-1.9.1/simgear/props/Makefile.am     2009-08-11 14:32:11.000000000 +0200
 315 @@ -1,25 +1,27 @@
 316  includedir = @includedir@/props
 317
 318 -lib_LIBRARIES = libsgprops.a
 319 +lib_LTLIBRARIES = libsgprops.la
 320
 321  include_HEADERS = \
 322         condition.hxx \
 323         props.hxx \
 324         props_io.hxx
 325
 326 -libsgprops_a_SOURCES = \
 327 +libsgprops_la_SOURCES = \
 328         condition.cxx \
 329         props.cxx \
 330         props_io.cxx
 331
 332 -noinst_PROGRAMS = props_test
 333
 334 -props_test_SOURCES = props_test.cxx
 335 -props_test_LDADD = \
 336 -       libsgprops.a \
 337 -       $(top_builddir)/simgear/xml/libsgxml.a \
 338 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 339 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 340 -       $(top_builddir)/simgear/structure/libsgstructure.a
 341 +# NOTE: Looped dependencies misc and props test files, commenting this one out
 342 +# noinst_PROGRAMS = props_test
 343 +
 344 +# props_test_SOURCES = props_test.cxx
 345 +# props_test_LDADD = \
 346 +#      libsgprops.la \
 347 +#      $(top_builddir)/simgear/xml/libsgxml.la \
 348 +#      $(top_builddir)/simgear/misc/libsgmisc.la \
 349 +#      $(top_builddir)/simgear/debug/libsgdebug.la \
 350 +#      $(top_builddir)/simgear/structure/libsgstructure.la
 351
 352  INCLUDES = -I$(top_srcdir)
 353 diff -uNr SimGear-1.9.1.orig/simgear/route/Makefile.am SimGear-1.9.1/simgear/route/Makefile.am
 354 --- SimGear-1.9.1.orig/simgear/route/Makefile.am        2009-01-25 13:00:32.000000000 +0100
 355 +++ SimGear-1.9.1/simgear/route/Makefile.am     2009-08-11 14:32:11.000000000 +0200
 356 @@ -1,10 +1,10 @@
 357  includedir = @includedir@/route
 358
 359 -lib_LIBRARIES = libsgroute.a
 360 +lib_LTLIBRARIES = libsgroute.la
 361
 362  include_HEADERS = route.hxx waypoint.hxx
 363
 364 -libsgroute_a_SOURCES = \
 365 +libsgroute_la_SOURCES = \
 366         route.cxx \
 367         waypoint.cxx
 368
 369 @@ -15,21 +15,21 @@
 370  waytest_SOURCES = waytest.cxx
 371
 372  waytest_LDADD = \
 373 -       libsgroute.a \
 374 -       $(top_builddir)/simgear/math/libsgmath.a \
 375 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 376 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 377 -       $(top_builddir)/simgear/props/libsgprops.a \
 378 -       $(top_builddir)/simgear/structure/libsgstructure.a \
 379 -       $(top_builddir)/simgear/xml/libsgxml.a \
 380 +       libsgroute.la \
 381 +       $(top_builddir)/simgear/math/libsgmath.la \
 382 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 383 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 384 +       $(top_builddir)/simgear/props/libsgprops.la \
 385 +       $(top_builddir)/simgear/structure/libsgstructure.la \
 386 +       $(top_builddir)/simgear/xml/libsgxml.la \
 387         $(base_LIBS) \
 388         -lz
 389
 390  routetest_SOURCES = routetest.cxx
 391
 392  routetest_LDADD = \
 393 -       libsgroute.a \
 394 -       $(top_builddir)/simgear/math/libsgmath.a \
 395 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 396 -       $(top_builddir)/simgear/structure/libsgstructure.a \
 397 +       libsgroute.la \
 398 +       $(top_builddir)/simgear/math/libsgmath.la \
 399 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 400 +       $(top_builddir)/simgear/structure/libsgstructure.la \
 401         $(base_LIBS)
 402 diff -uNr SimGear-1.9.1.orig/simgear/scene/material/Makefile.am SimGear-1.9.1/simgear/scene/material/Makefile.am
 403 --- SimGear-1.9.1.orig/simgear/scene/material/Makefile.am       2009-01-25 13:00:32.000000000 +0100
 404 +++ SimGear-1.9.1/simgear/scene/material/Makefile.am    2009-08-11 14:32:11.000000000 +0200
 405 @@ -1,6 +1,6 @@
 406  includedir = @includedir@/scene/material
 407
 408 -lib_LIBRARIES = libsgmaterial.a
 409 +lib_LTLIBRARIES = libsgmaterial.la
 410
 411  noinst_HEADERS =
 412
 413 @@ -9,7 +9,7 @@
 414         matlib.hxx \
 415         matmodel.hxx
 416
 417 -libsgmaterial_a_SOURCES = \
 418 +libsgmaterial_la_SOURCES = \
 419         mat.cxx \
 420         matlib.cxx \
 421         matmodel.cxx
 422 diff -uNr SimGear-1.9.1.orig/simgear/scene/model/Makefile.am SimGear-1.9.1/simgear/scene/model/Makefile.am
 423 --- SimGear-1.9.1.orig/simgear/scene/model/Makefile.am  2009-01-25 13:00:32.000000000 +0100
 424 +++ SimGear-1.9.1/simgear/scene/model/Makefile.am       2009-08-11 14:32:11.000000000 +0200
 425 @@ -1,6 +1,6 @@
 426  includedir = @includedir@/scene/model
 427
 428 -lib_LIBRARIES = libsgmodel.a
 429 +lib_LTLIBRARIES = libsgmodel.la
 430
 431  noinst_HEADERS =
 432
 433 @@ -25,7 +25,7 @@
 434         SGScaleTransform.hxx \
 435         SGTranslateTransform.hxx
 436
 437 -libsgmodel_a_SOURCES = \
 438 +libsgmodel_la_SOURCES = \
 439         animation.cxx \
 440         particles.cxx \
 441         location.cxx \
 442 diff -uNr SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am SimGear-1.9.1/simgear/scene/sky/Makefile.am
 443 --- SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am    2009-01-25 13:00:32.000000000 +0100
 444 +++ SimGear-1.9.1/simgear/scene/sky/Makefile.am 2009-08-11 14:32:11.000000000 +0200
 445 @@ -1,6 +1,6 @@
 446  includedir = @includedir@/scene/sky
 447
 448 -lib_LIBRARIES = libsgsky.a
 449 +lib_LTLIBRARIES = libsgsky.la
 450
 451  include_HEADERS = \
 452         cloud.hxx \
 453 @@ -15,7 +15,7 @@
 454         newcloud.hxx \
 455         CloudShaderGeometry.hxx
 456
 457 -libsgsky_a_SOURCES = \
 458 +libsgsky_la_SOURCES = \
 459         cloud.cxx \
 460         dome.cxx \
 461         moon.cxx \
 462 diff -uNr SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am SimGear-1.9.1/simgear/scene/tgdb/Makefile.am
 463 --- SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am   2009-01-25 13:00:32.000000000 +0100
 464 +++ SimGear-1.9.1/simgear/scene/tgdb/Makefile.am        2009-08-11 14:32:11.000000000 +0200
 465 @@ -1,6 +1,6 @@
 466  includedir = @includedir@/scene/tgdb
 467
 468 -lib_LIBRARIES = libsgtgdb.a
 469 +lib_LTLIBRARIES = libsgtgdb.la
 470
 471  noinst_HEADERS =
 472
 473 @@ -24,7 +24,7 @@
 474         TileCache.hxx \
 475         TileEntry.hxx
 476
 477 -libsgtgdb_a_SOURCES = \
 478 +libsgtgdb_la_SOURCES = \
 479         apt_signs.cxx \
 480         obj.cxx \
 481         pt_lights.cxx \
 482 diff -uNr SimGear-1.9.1.orig/simgear/scene/util/Makefile.am SimGear-1.9.1/simgear/scene/util/Makefile.am
 483 --- SimGear-1.9.1.orig/simgear/scene/util/Makefile.am   2009-01-25 13:00:32.000000000 +0100
 484 +++ SimGear-1.9.1/simgear/scene/util/Makefile.am        2009-08-11 14:32:11.000000000 +0200
 485 @@ -1,6 +1,6 @@
 486  includedir = @includedir@/scene/util
 487
 488 -lib_LIBRARIES = libsgutil.a
 489 +lib_LTLIBRARIES = libsgutil.la
 490
 491  noinst_HEADERS =
 492
 493 @@ -21,7 +21,7 @@
 494         VectorArrayAdapter.hxx
 495
 496
 497 -libsgutil_a_SOURCES = \
 498 +libsgutil_la_SOURCES = \
 499         SGEnlargeBoundingBox.cxx \
 500         SGSceneFeatures.cxx \
 501         SGSceneUserData.cxx \
 502 diff -uNr SimGear-1.9.1.orig/simgear/screen/Makefile.am SimGear-1.9.1/simgear/screen/Makefile.am
 503 --- SimGear-1.9.1.orig/simgear/screen/Makefile.am       2009-01-25 13:00:32.000000000 +0100
 504 +++ SimGear-1.9.1/simgear/screen/Makefile.am    2009-08-11 14:32:11.000000000 +0200
 505 @@ -1,6 +1,6 @@
 506  includedir = @includedir@/screen
 507
 508 -lib_LIBRARIES = libsgscreen.a
 509 +lib_LTLIBRARIES = libsgscreen.la
 510
 511  EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx
 512
 513 @@ -24,7 +24,7 @@
 514         shader.h \
 515         tr.h
 516
 517 -libsgscreen_a_SOURCES = \
 518 +libsgscreen_la_SOURCES = \
 519         texture.cxx \
 520         GLBitmaps.cxx \
 521         $(IMAGE_SERVER_SRCS) \
 522 @@ -41,8 +41,8 @@
 523  TestRenderTexture_SOURCES = TestRenderTexture.cpp
 524
 525  TestRenderTexture_LDADD = \
 526 -       libsgscreen.a \
 527 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 528 +       libsgscreen.la \
 529 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 530         $(opengl_LIBS)
 531  endif
 532
 533 diff -uNr SimGear-1.9.1.orig/simgear/serial/Makefile.am SimGear-1.9.1/simgear/serial/Makefile.am
 534 --- SimGear-1.9.1.orig/simgear/serial/Makefile.am       2009-01-25 13:00:32.000000000 +0100
 535 +++ SimGear-1.9.1/simgear/serial/Makefile.am    2009-08-11 14:32:11.000000000 +0200
 536 @@ -1,17 +1,17 @@
 537  includedir = @includedir@/serial
 538
 539 -lib_LIBRARIES = libsgserial.a
 540 +lib_LTLIBRARIES = libsgserial.la
 541
 542  include_HEADERS = serial.hxx
 543
 544 -libsgserial_a_SOURCES = serial.cxx
 545 +libsgserial_la_SOURCES = serial.cxx
 546
 547  noinst_PROGRAMS = testserial
 548
 549  testserial_SOURCES = testserial.cxx
 550
 551  testserial_LDADD = \
 552 -       libsgserial.a \
 553 -       $(top_builddir)/simgear/debug/libsgdebug.a
 554 +       libsgserial.la \
 555 +       $(top_builddir)/simgear/debug/libsgdebug.la
 556
 557  INCLUDES = -I$(top_srcdir)
 558 diff -uNr SimGear-1.9.1.orig/simgear/sound/Makefile.am SimGear-1.9.1/simgear/sound/Makefile.am
 559 --- SimGear-1.9.1.orig/simgear/sound/Makefile.am        2009-01-25 13:00:32.000000000 +0100
 560 +++ SimGear-1.9.1/simgear/sound/Makefile.am     2009-08-11 14:32:11.000000000 +0200
 561 @@ -2,7 +2,7 @@
 562
 563  EXTRA_DIST = jet.wav
 564
 565 -lib_LIBRARIES = libsgsound.a
 566 +lib_LTLIBRARIES = libsgsound.la
 567
 568  noinst_HEADERS =
 569
 570 @@ -11,7 +11,7 @@
 571         soundmgr_openal.hxx \
 572         xmlsound.hxx
 573
 574 -libsgsound_a_SOURCES = \
 575 +libsgsound_la_SOURCES = \
 576         sample_openal.cxx  \
 577         soundmgr_openal.cxx \
 578         xmlsound.cxx
 579 @@ -22,14 +22,14 @@
 580  openal_test2_SOURCES = openal_test2.cxx
 581
 582  openal_test1_LDADD = \
 583 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 584 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 585         $(openal_LIBS)
 586
 587  openal_test2_LDADD = \
 588 -       libsgsound.a \
 589 -       $(top_builddir)/simgear/debug/libsgdebug.a \
 590 -       $(top_builddir)/simgear/misc/libsgmisc.a \
 591 -       $(top_builddir)/simgear/structure/libsgstructure.a \
 592 +       libsgsound.la \
 593 +       $(top_builddir)/simgear/debug/libsgdebug.la \
 594 +       $(top_builddir)/simgear/misc/libsgmisc.la \
 595 +       $(top_builddir)/simgear/structure/libsgstructure.la \
 596         $(openal_LIBS)
 597
 598  INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"
 599 diff -uNr SimGear-1.9.1.orig/simgear/structure/Makefile.am SimGear-1.9.1/simgear/structure/Makefile.am
 600 --- SimGear-1.9.1.orig/simgear/structure/Makefile.am    2009-01-25 13:00:32.000000000 +0100
 601 +++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-11 14:32:11.000000000 +0200
 602 @@ -1,6 +1,6 @@
 603  includedir = @includedir@/structure
 604
 605 -lib_LIBRARIES = libsgstructure.a
 606 +lib_LTLIBRARIES = libsgstructure.la
 607
 608  include_HEADERS = \
 609         callback.hxx \
 610 @@ -19,7 +19,7 @@
 611         SGSmplstat.hxx \
 612         Singleton.hxx
 613
 614 -libsgstructure_a_SOURCES = \
 615 +libsgstructure_la_SOURCES = \
 616         commands.cxx \
 617         exception.cxx \
 618         event_mgr.cxx\
 619 diff -uNr SimGear-1.9.1.orig/simgear/threads/Makefile.am SimGear-1.9.1/simgear/threads/Makefile.am
 620 --- SimGear-1.9.1.orig/simgear/threads/Makefile.am      2009-01-25 13:00:32.000000000 +0100
 621 +++ SimGear-1.9.1/simgear/threads/Makefile.am   2009-08-11 14:32:11.000000000 +0200
 622 @@ -1,13 +1,13 @@
 623  includedir = @includedir@/threads
 624
 625 -lib_LIBRARIES = libsgthreads.a
 626 +lib_LTLIBRARIES = libsgthreads.la
 627
 628  include_HEADERS = \
 629         SGGuard.hxx \
 630         SGQueue.hxx \
 631         SGThread.hxx
 632
 633 -libsgthreads_a_SOURCES = \
 634 +libsgthreads_la_SOURCES = \
 635         SGThread.cxx
 636
 637  INCLUDES = -I$(top_srcdir)
 638 diff -uNr SimGear-1.9.1.orig/simgear/timing/Makefile.am SimGear-1.9.1/simgear/timing/Makefile.am
 639 --- SimGear-1.9.1.orig/simgear/timing/Makefile.am       2009-01-25 13:00:32.000000000 +0100
 640 +++ SimGear-1.9.1/simgear/timing/Makefile.am    2009-08-11 14:32:11.000000000 +0200
 641 @@ -1,6 +1,6 @@
 642  includedir = @includedir@/timing
 643
 644 -lib_LIBRARIES = libsgtiming.a
 645 +lib_LTLIBRARIES = libsgtiming.la
 646
 647  include_HEADERS = \
 648         geocoord.h \
 649 @@ -9,7 +9,7 @@
 650         timestamp.hxx \
 651         timezone.h
 652
 653 -libsgtiming_a_SOURCES = \
 654 +libsgtiming_la_SOURCES = \
 655         geocoord.cxx \
 656         lowleveltime.cxx \
 657         sg_time.cxx \
 658 diff -uNr SimGear-1.9.1.orig/simgear/xml/Makefile.am SimGear-1.9.1/simgear/xml/Makefile.am
 659 --- SimGear-1.9.1.orig/simgear/xml/Makefile.am  2009-01-25 13:00:32.000000000 +0100
 660 +++ SimGear-1.9.1/simgear/xml/Makefile.am       2009-08-11 14:32:11.000000000 +0200
 661 @@ -1,6 +1,6 @@
 662  includedir = @includedir@/xml
 663
 664 -lib_LIBRARIES = libsgxml.a
 665 +lib_LTLIBRARIES = libsgxml.la
 666
 667  include_HEADERS = \
 668         easyxml.hxx
 669 @@ -8,7 +8,7 @@
 670  noinst_HEADERS = \
 671         xmltok_impl.c xmltok_ns.c
 672
 673 -libsgxml_a_SOURCES = \
 674 +libsgxml_la_SOURCES = \
 675         asciitab.h \
 676         easyxml.cxx \
 677         hashtable.h hashtable.c \