---- configure.in~ Sun Apr 21 00:03:48 2002
-+++ configure.in Thu May 9 00:36:15 2002
-@@ -33,7 +33,7 @@
+diff -uNr SimGear-1.9.1.orig/configure.ac SimGear-1.9.1/configure.ac
+--- SimGear-1.9.1.orig/configure.ac 2009-01-25 13:03:56.000000000 +0100
++++ SimGear-1.9.1/configure.ac 2009-08-11 14:32:11.000000000 +0200
+@@ -34,7 +34,7 @@
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
+AC_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_LN_S
-
---- simgear/bucket/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/bucket/Makefile.am Thu May 9 00:39:33 2002
+ AX_BOOST_BASE([1.34.0])
+diff -uNr SimGear-1.9.1.orig/simgear/bucket/Makefile.am SimGear-1.9.1/simgear/bucket/Makefile.am
+--- SimGear-1.9.1.orig/simgear/bucket/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/bucket/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,10 +1,10 @@
includedir = @includedir@/bucket
# noinst_PROGRAMS = testbucket
---- simgear/debug/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/debug/Makefile.am Thu May 9 00:40:16 2002
-@@ -2,11 +2,11 @@
+diff -uNr SimGear-1.9.1.orig/simgear/debug/Makefile.am SimGear-1.9.1/simgear/debug/Makefile.am
+--- SimGear-1.9.1.orig/simgear/debug/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/debug/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -2,10 +2,10 @@
EXTRA_DIST = logtest.cxx
+libsgdebug_la_SOURCES = logstream.cxx
INCLUDES = -I$(top_srcdir)
+diff -uNr SimGear-1.9.1.orig/simgear/environment/Makefile.am SimGear-1.9.1/simgear/environment/Makefile.am
+--- SimGear-1.9.1.orig/simgear/environment/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/environment/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,9 +1,9 @@
+ includedir = @includedir@/environment
+
+-lib_LIBRARIES = libsgenvironment.a
++lib_LTLIBRARIES = libsgenvironment.la
+
+ include_HEADERS = metar.hxx visual_enviro.hxx precipitation.hxx
---- simgear/ephemeris/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/ephemeris/Makefile.am Thu May 9 00:41:24 2002
+-libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
++libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
+
+ INCLUDES = -I$(top_srcdir)
+diff -uNr SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am SimGear-1.9.1/simgear/ephemeris/Makefile.am
+--- SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/ephemeris/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/ephemeris
celestialBody.cxx \
ephemeris.cxx \
jupiter.cxx \
---- simgear/io/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/io/Makefile.am Thu May 9 00:44:11 2002
+diff -uNr SimGear-1.9.1.orig/simgear/io/Makefile.am SimGear-1.9.1/simgear/io/Makefile.am
+--- SimGear-1.9.1.orig/simgear/io/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/io/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/io
iochannel.cxx \
lowlevel.cxx \
sg_binobj.cxx \
-@@ -33,24 +33,32 @@
- socktest_SOURCES = socktest.cxx
+@@ -27,10 +27,10 @@
+ tcp_server_SOURCES = tcp_server.cxx
- socktest_LDADD = \
-- $(top_builddir)/simgear/bucket/libsgbucket.a \
-- $(top_builddir)/simgear/io/libsgio.a \
+ tcp_server_LDADD = \
+- libsgio.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/bucket/libsgbucket.a \
- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/xml/libsgxml.a \
-- -lz
++ libsgio.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/io/libsgio.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
+ -lplibnet -lplibul -lz \
+ $(network_LIBS) \
+ $(base_LIBS)
+@@ -38,10 +38,10 @@
+ tcp_client_SOURCES = tcp_client.cxx
+
+ tcp_client_LDADD = \
+- libsgio.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/bucket/libsgbucket.a \
+- $(top_builddir)/simgear/misc/libsgmisc.a \
++ libsgio.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
++ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ -lz -lplibnet
+ -lplibnet -lplibul -lz \
+ $(network_LIBS) \
+ $(base_LIBS)
+@@ -49,10 +49,10 @@
+ socktest_SOURCES = socktest.cxx
+ socktest_LDADD = \
+- libsgio.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/bucket/libsgbucket.a \
+- $(top_builddir)/simgear/misc/libsgmisc.a \
++ libsgio.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/bucket/libsgbucket.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
+ -lplibnet -lplibul -lz \
+ $(network_LIBS) \
+ $(base_LIBS)
+@@ -60,17 +60,17 @@
lowtest_SOURCES = lowtest.cxx
lowtest_LDADD = \
-- $(top_builddir)/simgear/io/libsgio.a
-+ $(top_builddir)/simgear/io/libsgio.la \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
+- libsgio.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/bucket/libsgbucket.a \
+- $(top_builddir)/simgear/misc/libsgmisc.a \
++ libsgio.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ -lz -lplibnet
++ $(top_builddir)/simgear/bucket/libsgbucket.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
+ $(base_LIBS) -lz
decode_binobj_SOURCES = decode_binobj.cxx
decode_binobj_LDADD = \
-- $(top_builddir)/simgear/io/libsgio.a \
-- $(top_builddir)/simgear/bucket/libsgbucket.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/xml/libsgxml.a \
-- $(NETWORK_LIB) -lz
-+ $(top_builddir)/simgear/io/libsgio.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(NETWORK_LIB) -lz -lplibnet
---- simgear/magvar/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/magvar/Makefile.am Thu May 9 00:45:27 2002
+- libsgio.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/bucket/libsgbucket.a \
+- $(top_builddir)/simgear/misc/libsgmisc.a \
++ libsgio.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/bucket/libsgbucket.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
+ $(base_LIBS) -lz
+diff -uNr SimGear-1.9.1.orig/simgear/magvar/Makefile.am SimGear-1.9.1/simgear/magvar/Makefile.am
+--- SimGear-1.9.1.orig/simgear/magvar/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/magvar/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,10 +1,10 @@
includedir = @includedir@/magvar
coremag.hxx coremag.cxx \
magvar.cxx
-@@ -12,7 +12,7 @@
-
+@@ -13,7 +13,7 @@
testmagvar_SOURCES = testmagvar.cxx
--testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
-+testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.la
+ testmagvar_LDADD = \
+- libsgmagvar.a \
++ libsgmagvar.la \
+ $(base_LIBS)
INCLUDES = -I$(top_srcdir)
-
---- simgear/math/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/math/Makefile.am Thu May 9 00:46:28 2002
-@@ -1,6 +1,6 @@
- includedir = @includedir@/math
+diff -uNr SimGear-1.9.1.orig/simgear/Makefile.am SimGear-1.9.1/simgear/Makefile.am
+--- SimGear-1.9.1.orig/simgear/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/Makefile.am 2009-08-11 14:33:26.000000000 +0200
+@@ -16,22 +16,22 @@
+ $(compatibility_DIR) \
+- xml \
+ debug \
++ serial \
++ nasal \
+- misc \
++ timing \
+ structure \
++ xml \
++ props \
++ misc \
+ bucket \
+ ephemeris \
+ io \
+ magvar \
+ math \
+- $(METAR_DIRS) \
+- nasal \
+- props \
+ route \
+- scene \
+ screen \
+- serial \
+ sound \
+- $(SGTHREAD_DIR) \
+- timing
++ scene \
++ $(METAR_DIRS) \
++ $(SGTHREAD_DIR)
+
+ DIST_SUBDIRS = $(SUBDIRS) compatibility
+diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am SimGear-1.9.1/simgear/math/Makefile.am
+--- SimGear-1.9.1.orig/simgear/math/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/math/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -4,12 +4,12 @@
+ TESTS = $(check_PROGRAMS)
+
+ SGMathTest_SOURCES = SGMathTest.cxx
+-SGMathTest_LDADD = libsgmath.a $(base_LIBS)
++SGMathTest_LDADD = libsgmath.la $(base_LIBS)
+
+ SGGeometryTest_SOURCES = SGGeometryTest.cxx
+-SGGeometryTest_LDADD = libsgmath.a $(base_LIBS)
++SGGeometryTest_LDADD = libsgmath.la $(base_LIBS)
-lib_LIBRARIES = libsgmath.a
+lib_LTLIBRARIES = libsgmath.la
include_HEADERS = \
interpolater.hxx \
-@@ -16,7 +16,7 @@
-
- EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
+@@ -44,7 +44,7 @@
+ SGVec3.hxx \
+ SGVec4.hxx
-libsgmath_a_SOURCES = \
+libsgmath_la_SOURCES = \
interpolater.cxx \
leastsqs.cxx \
- polar3d.cxx \
---- simgear/metar/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/metar/Makefile.am Thu May 9 00:47:28 2002
-@@ -1,10 +1,10 @@
- includedir = @includedir@/metar
-
--lib_LIBRARIES = libsgmetar.a
-+lib_LTLIBRARIES = libsgmetar.la
-
- include_HEADERS = MetarReport.h MetarStation.h
-
--libsgmetar_a_SOURCES = \
-+libsgmetar_la_SOURCES = \
- Antoi.cpp Charcmp.cpp Dcdmetar.cpp Dcdmtrmk.cpp Drvmetar.c \
- Fracpart.cpp Local.h Metar.h \
- MetarReport.cpp \
---- simgear/misc/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/misc/Makefile.am Thu May 9 00:49:22 2002
+ sg_random.c \
+diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am SimGear-1.9.1/simgear/misc/Makefile.am
+--- SimGear-1.9.1.orig/simgear/misc/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/misc/Makefile.am 2009-08-11 14:34:32.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/misc
+lib_LTLIBRARIES = libsgmisc.la
include_HEADERS = \
- commands.hxx \
+ sg_path.hxx \
@@ -14,7 +14,7 @@
- texcoord.hxx \
- zfstream.hxx
+ stdint.hxx \
+ PathOptions.hxx
-libsgmisc_a_SOURCES = \
+libsgmisc_la_SOURCES = \
- commands.cxx \
- exception.cxx \
+ sg_path.cxx \
+ sgstream.cxx \
+ strutils.cxx \
+@@ -28,15 +28,15 @@
+
+ tabbed_value_test_SOURCES = tabbed_values_test.cxx
+ tabbed_value_test_LDADD = \
+- libsgmisc.a \
+- $(top_builddir)/simgear/xml/libsgxml.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a
++ libsgmisc.la \
++ $(top_builddir)/simgear/xml/libsgxml.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la
+
+ $(top_builddir)/simgear/xml/libsgxml.a:
+- cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
++ cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.la
+
+ $(top_builddir)/simgear/debug/libsgdebug.a:
+- cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
++ cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.la
+
+ swap_test_SOURCES = swap_test.cpp
+
+diff -uNr SimGear-1.9.1.orig/simgear/nasal/Makefile.am SimGear-1.9.1/simgear/nasal/Makefile.am
+--- SimGear-1.9.1.orig/simgear/nasal/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/nasal/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,10 +1,10 @@
+ includedir = @includedir@/nasal
+
+-lib_LIBRARIES = libsgnasal.a
++lib_LTLIBRARIES = libsgnasal.la
+
+ include_HEADERS = nasal.h naref.h
+
+-libsgnasal_a_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c \
++libsgnasal_la_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c \
+ hash.c iolib.c iolib.h lex.c lib.c mathlib.c \
+ misc.c naref.h nasal.h parse.c parse.h string.c \
+ thread-posix.c thread-win32.c threadlib.c \
+diff -uNr SimGear-1.9.1.orig/simgear/props/Makefile.am SimGear-1.9.1/simgear/props/Makefile.am
+--- SimGear-1.9.1.orig/simgear/props/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/props/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,25 +1,27 @@
+ includedir = @includedir@/props
+
+-lib_LIBRARIES = libsgprops.a
++lib_LTLIBRARIES = libsgprops.la
+
+ include_HEADERS = \
+ condition.hxx \
+ props.hxx \
+ props_io.hxx
+
+-libsgprops_a_SOURCES = \
++libsgprops_la_SOURCES = \
+ condition.cxx \
props.cxx \
-@@ -28,7 +28,7 @@
- noinst_PROGRAMS = props_test
+ props_io.cxx
- props_test_SOURCES = props_test.cxx
--props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
-+props_test_LDADD = libsgmisc.la ../xml/libsgxml.la ../debug/libsgdebug.la -lz
+-noinst_PROGRAMS = props_test
- INCLUDES = -I$(top_srcdir)
+-props_test_SOURCES = props_test.cxx
+-props_test_LDADD = \
+- libsgprops.a \
+- $(top_builddir)/simgear/xml/libsgxml.a \
+- $(top_builddir)/simgear/misc/libsgmisc.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/structure/libsgstructure.a
++# NOTE: Looped dependencies misc and props test files, commenting this one out
++# noinst_PROGRAMS = props_test
++
++# props_test_SOURCES = props_test.cxx
++# props_test_LDADD = \
++# libsgprops.la \
++# $(top_builddir)/simgear/xml/libsgxml.la \
++# $(top_builddir)/simgear/misc/libsgmisc.la \
++# $(top_builddir)/simgear/debug/libsgdebug.la \
++# $(top_builddir)/simgear/structure/libsgstructure.la
---- simgear/route/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/route/Makefile.am Thu May 9 00:51:04 2002
+ INCLUDES = -I$(top_srcdir)
+diff -uNr SimGear-1.9.1.orig/simgear/route/Makefile.am SimGear-1.9.1/simgear/route/Makefile.am
+--- SimGear-1.9.1.orig/simgear/route/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/route/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,10 +1,10 @@
includedir = @includedir@/route
route.cxx \
waypoint.cxx
-@@ -15,16 +15,19 @@
+@@ -15,21 +15,21 @@
waytest_SOURCES = waytest.cxx
waytest_LDADD = \
-- $(top_builddir)/simgear/route/libsgroute.a \
+- libsgroute.a \
- $(top_builddir)/simgear/math/libsgmath.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
- $(top_builddir)/simgear/misc/libsgmisc.a \
+- $(top_builddir)/simgear/props/libsgprops.a \
+- $(top_builddir)/simgear/structure/libsgstructure.a \
- $(top_builddir)/simgear/xml/libsgxml.a \
-+ $(top_builddir)/simgear/route/libsgroute.la \
++ libsgroute.la \
+ $(top_builddir)/simgear/math/libsgmath.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
++ $(top_builddir)/simgear/props/libsgprops.la \
++ $(top_builddir)/simgear/structure/libsgstructure.la \
+ $(top_builddir)/simgear/xml/libsgxml.la \
+ $(base_LIBS) \
-lz
routetest_SOURCES = routetest.cxx
routetest_LDADD = \
-- $(top_builddir)/simgear/route/libsgroute.a \
+- libsgroute.a \
- $(top_builddir)/simgear/math/libsgmath.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a
-+ $(top_builddir)/simgear/route/libsgroute.la \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/structure/libsgstructure.a \
++ libsgroute.la \
+ $(top_builddir)/simgear/math/libsgmath.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ -lz
---- simgear/screen/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/screen/Makefile.am Thu May 9 00:51:54 2002
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/structure/libsgstructure.la \
+ $(base_LIBS)
+diff -uNr SimGear-1.9.1.orig/simgear/scene/material/Makefile.am SimGear-1.9.1/simgear/scene/material/Makefile.am
+--- SimGear-1.9.1.orig/simgear/scene/material/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/scene/material/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,6 +1,6 @@
+ includedir = @includedir@/scene/material
+
+-lib_LIBRARIES = libsgmaterial.a
++lib_LTLIBRARIES = libsgmaterial.la
+
+ noinst_HEADERS =
+
+@@ -9,7 +9,7 @@
+ matlib.hxx \
+ matmodel.hxx
+
+-libsgmaterial_a_SOURCES = \
++libsgmaterial_la_SOURCES = \
+ mat.cxx \
+ matlib.cxx \
+ matmodel.cxx
+diff -uNr SimGear-1.9.1.orig/simgear/scene/model/Makefile.am SimGear-1.9.1/simgear/scene/model/Makefile.am
+--- SimGear-1.9.1.orig/simgear/scene/model/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/scene/model/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,6 +1,6 @@
+ includedir = @includedir@/scene/model
+
+-lib_LIBRARIES = libsgmodel.a
++lib_LTLIBRARIES = libsgmodel.la
+
+ noinst_HEADERS =
+
+@@ -25,7 +25,7 @@
+ SGScaleTransform.hxx \
+ SGTranslateTransform.hxx
+
+-libsgmodel_a_SOURCES = \
++libsgmodel_la_SOURCES = \
+ animation.cxx \
+ particles.cxx \
+ location.cxx \
+diff -uNr SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am SimGear-1.9.1/simgear/scene/sky/Makefile.am
+--- SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/scene/sky/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,6 +1,6 @@
+ includedir = @includedir@/scene/sky
+
+-lib_LIBRARIES = libsgsky.a
++lib_LTLIBRARIES = libsgsky.la
+
+ include_HEADERS = \
+ cloud.hxx \
+@@ -15,7 +15,7 @@
+ newcloud.hxx \
+ CloudShaderGeometry.hxx
+
+-libsgsky_a_SOURCES = \
++libsgsky_la_SOURCES = \
+ cloud.cxx \
+ dome.cxx \
+ moon.cxx \
+diff -uNr SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am SimGear-1.9.1/simgear/scene/tgdb/Makefile.am
+--- SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/scene/tgdb/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,6 +1,6 @@
+ includedir = @includedir@/scene/tgdb
+
+-lib_LIBRARIES = libsgtgdb.a
++lib_LTLIBRARIES = libsgtgdb.la
+
+ noinst_HEADERS =
+
+@@ -24,7 +24,7 @@
+ TileCache.hxx \
+ TileEntry.hxx
+
+-libsgtgdb_a_SOURCES = \
++libsgtgdb_la_SOURCES = \
+ apt_signs.cxx \
+ obj.cxx \
+ pt_lights.cxx \
+diff -uNr SimGear-1.9.1.orig/simgear/scene/util/Makefile.am SimGear-1.9.1/simgear/scene/util/Makefile.am
+--- SimGear-1.9.1.orig/simgear/scene/util/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/scene/util/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,6 +1,6 @@
+ includedir = @includedir@/scene/util
+
+-lib_LIBRARIES = libsgutil.a
++lib_LTLIBRARIES = libsgutil.la
+
+ noinst_HEADERS =
+
+@@ -21,7 +21,7 @@
+ VectorArrayAdapter.hxx
+
+
+-libsgutil_a_SOURCES = \
++libsgutil_la_SOURCES = \
+ SGEnlargeBoundingBox.cxx \
+ SGSceneFeatures.cxx \
+ SGSceneUserData.cxx \
+diff -uNr SimGear-1.9.1.orig/simgear/screen/Makefile.am SimGear-1.9.1/simgear/screen/Makefile.am
+--- SimGear-1.9.1.orig/simgear/screen/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/screen/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/screen
-lib_LIBRARIES = libsgscreen.a
+lib_LTLIBRARIES = libsgscreen.la
- if ENABLE_JPEG_SERVER
- IMAGE_SERVER_INCL = jpgfactory.hxx
-@@ -12,7 +12,7 @@
+ EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx
- include_HEADERS = $(IMAGE_SERVER_INCL) screen-dump.hxx tr.h
+@@ -24,7 +24,7 @@
+ shader.h \
+ tr.h
-libsgscreen_a_SOURCES = \
+libsgscreen_la_SOURCES = \
- GLBitmaps.cxx GLBitmaps.h \
+ texture.cxx \
+ GLBitmaps.cxx \
$(IMAGE_SERVER_SRCS) \
- screen-dump.cxx \
---- simgear/serial/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/serial/Makefile.am Thu May 9 00:52:55 2002
-@@ -2,17 +2,17 @@
+@@ -41,8 +41,8 @@
+ TestRenderTexture_SOURCES = TestRenderTexture.cpp
- noinst_PROGRAMS = testserial
+ TestRenderTexture_LDADD = \
+- libsgscreen.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
++ libsgscreen.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(opengl_LIBS)
+ endif
+
+diff -uNr SimGear-1.9.1.orig/simgear/serial/Makefile.am SimGear-1.9.1/simgear/serial/Makefile.am
+--- SimGear-1.9.1.orig/simgear/serial/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/serial/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,17 +1,17 @@
+ includedir = @includedir@/serial
-lib_LIBRARIES = libsgserial.a
+lib_LTLIBRARIES = libsgserial.la
-libsgserial_a_SOURCES = serial.cxx
+libsgserial_la_SOURCES = serial.cxx
+ noinst_PROGRAMS = testserial
+
testserial_SOURCES = testserial.cxx
testserial_LDADD = \
-- $(top_builddir)/simgear/serial/libsgserial.a \
+- libsgserial.a \
- $(top_builddir)/simgear/debug/libsgdebug.a
-+ $(top_builddir)/simgear/serial/libsgserial.la \
++ libsgserial.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la
INCLUDES = -I$(top_srcdir)
+diff -uNr SimGear-1.9.1.orig/simgear/sound/Makefile.am SimGear-1.9.1/simgear/sound/Makefile.am
+--- SimGear-1.9.1.orig/simgear/sound/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/sound/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ EXTRA_DIST = jet.wav
+
+-lib_LIBRARIES = libsgsound.a
++lib_LTLIBRARIES = libsgsound.la
+
+ noinst_HEADERS =
---- simgear/sky/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/sky/Makefile.am Thu May 9 00:54:55 2002
+@@ -11,7 +11,7 @@
+ soundmgr_openal.hxx \
+ xmlsound.hxx
+
+-libsgsound_a_SOURCES = \
++libsgsound_la_SOURCES = \
+ sample_openal.cxx \
+ soundmgr_openal.cxx \
+ xmlsound.cxx
+@@ -22,14 +22,14 @@
+ openal_test2_SOURCES = openal_test2.cxx
+
+ openal_test1_LDADD = \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(openal_LIBS)
+
+ openal_test2_LDADD = \
+- libsgsound.a \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
+- $(top_builddir)/simgear/misc/libsgmisc.a \
+- $(top_builddir)/simgear/structure/libsgstructure.a \
++ libsgsound.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
++ $(top_builddir)/simgear/structure/libsgstructure.la \
+ $(openal_LIBS)
+
+ INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"
+diff -uNr SimGear-1.9.1.orig/simgear/structure/Makefile.am SimGear-1.9.1/simgear/structure/Makefile.am
+--- SimGear-1.9.1.orig/simgear/structure/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,6 +1,6 @@
- includedir = @includedir@/sky
+ includedir = @includedir@/structure
--lib_LIBRARIES = libsgsky.a
-+lib_LTLIBRARIES = libsgsky.la
+-lib_LIBRARIES = libsgstructure.a
++lib_LTLIBRARIES = libsgstructure.la
include_HEADERS = \
- cloud.hxx \
-@@ -11,7 +11,7 @@
- sphere.hxx \
- stars.hxx
+ callback.hxx \
+@@ -19,7 +19,7 @@
+ SGSmplstat.hxx \
+ Singleton.hxx
+
+-libsgstructure_a_SOURCES = \
++libsgstructure_la_SOURCES = \
+ commands.cxx \
+ exception.cxx \
+ event_mgr.cxx\
+diff -uNr SimGear-1.9.1.orig/simgear/threads/Makefile.am SimGear-1.9.1/simgear/threads/Makefile.am
+--- SimGear-1.9.1.orig/simgear/threads/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/threads/Makefile.am 2009-08-11 14:32:11.000000000 +0200
+@@ -1,13 +1,13 @@
+ includedir = @includedir@/threads
--libsgsky_a_SOURCES = \
-+libsgsky_la_SOURCES = \
- cloud.cxx \
- dome.cxx \
- moon.cxx \
---- simgear/timing/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/timing/Makefile.am Thu May 9 00:55:32 2002
+-lib_LIBRARIES = libsgthreads.a
++lib_LTLIBRARIES = libsgthreads.la
+
+ include_HEADERS = \
+ SGGuard.hxx \
+ SGQueue.hxx \
+ SGThread.hxx
+
+-libsgthreads_a_SOURCES = \
++libsgthreads_la_SOURCES = \
+ SGThread.cxx
+
+ INCLUDES = -I$(top_srcdir)
+diff -uNr SimGear-1.9.1.orig/simgear/timing/Makefile.am SimGear-1.9.1/simgear/timing/Makefile.am
+--- SimGear-1.9.1.orig/simgear/timing/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/timing/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/timing
geocoord.cxx \
lowleveltime.cxx \
sg_time.cxx \
---- simgear/xgl/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/xgl/Makefile.am Thu May 9 00:56:07 2002
-@@ -1,10 +1,10 @@
- includedir = @includedir@/xgl
-
--lib_LIBRARIES = libsgxgl.a
-+lib_LTLIBRARIES = libsgxgl.la
-
- include_HEADERS = xgl.h
-
--libsgxgl_a_SOURCES = xgl.c xglUtils.c
-+libsgxgl_la_SOURCES = xgl.c xglUtils.c
-
- INCLUDES = -I$(top_srcdir)
-
---- simgear/xml/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/xml/Makefile.am Thu May 9 00:56:39 2002
+diff -uNr SimGear-1.9.1.orig/simgear/xml/Makefile.am SimGear-1.9.1/simgear/xml/Makefile.am
+--- SimGear-1.9.1.orig/simgear/xml/Makefile.am 2009-01-25 13:00:32.000000000 +0100
++++ SimGear-1.9.1/simgear/xml/Makefile.am 2009-08-11 14:32:11.000000000 +0200
@@ -1,6 +1,6 @@
includedir = @includedir@/xml
-libsgxml_a_SOURCES = \
+libsgxml_la_SOURCES = \
- asciitab.h \
+ asciitab.h \
easyxml.cxx \
hashtable.h hashtable.c \
---- simgear/threads/Makefile.am~ Thu May 9 00:35:01 2002
-+++ simgear/threads/Makefile.am Thu May 9 00:57:41 2002
-@@ -1,13 +1,13 @@
- includedir = @includedir@/threads
-
--lib_LIBRARIES = libsgthreads.a
-+lib_LTLIBRARIES = libsgthreads.la
-
- include_HEADERS = \
- SGGuard.hxx \
- SGQueue.hxx \
- SGThread.hxx
-
--libsgthreads_a_SOURCES = \
-+libsgthreads_la_SOURCES = \
- SGThread.cxx
-
- INCLUDES = -I$(top_srcdir)
-
---- simgear/Makefile.am~ Sat Dec 29 01:37:03 2001
-+++ simgear/Makefile.am Thu May 9 02:36:08 2002
-@@ -24,13 +24,13 @@
- misc \
- bucket \
- ephemeris \
-+ $(SERIAL_DIRS) \
- io \
- magvar \
- math \
- $(METAR_DIRS) \
- route \
- screen \
-- $(SERIAL_DIRS) \
- sky \
- $(SGTHREAD_DIR) \
- timing \
projects / packages / SimGear.git / blobdiff