---- SimGear-0.3.10/simgear/math/Makefile.am~ 2007-05-27 22:53:42.188543954 +0200
-+++ SimGear-0.3.10/simgear/math/Makefile.am 2007-05-27 22:59:01.806577335 +0200
-@@ -51,4 +51,8 @@
- fastmath.cxx \
+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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/io/Makefile.am 2009-08-11 18:09:26.000000000 +0200
+@@ -20,6 +20,14 @@
+ sg_socket.cxx \
+ sg_socket_udp.cxx
+
++libsgio_la_LIBADD = \
++ $(top_builddir)/simgear/bucket/libsgbucket.la \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ $(top_builddir)/simgear/misc/libsgmisc.la \
++ $(top_builddir)/simgear/serial/libsgserial.la \
++ -lplibnet \
++ -lz
++
+ INCLUDES = -I$(top_srcdir)
+
+ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
+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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/math/Makefile.am 2009-08-11 18:09:26.000000000 +0200
+@@ -52,4 +52,8 @@
+ SGGeod.cxx \
SGGeodesy.cxx
+libsgmath_la_LIBADD = \
+ $(top_builddir)/simgear/misc/libsgmisc.la
+
INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10/simgear/screen/Makefile.am~ 2007-05-27 23:11:02.950348097 +0200
-+++ SimGear-0.3.10/simgear/screen/Makefile.am 2007-05-27 23:33:34.620784199 +0200
-@@ -35,6 +35,10 @@
- shader.cpp \
- win32-printer.h
+diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am.orig SimGear-1.9.1/simgear/math/Makefile.am.orig
+--- SimGear-1.9.1.orig/simgear/math/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100
++++ SimGear-1.9.1/simgear/math/Makefile.am.orig 2009-08-11 18:09:26.000000000 +0200
+@@ -0,0 +1,55 @@
++includedir = @includedir@/math
++
++check_PROGRAMS = SGMathTest SGGeometryTest
++TESTS = $(check_PROGRAMS)
++
++SGMathTest_SOURCES = SGMathTest.cxx
++SGMathTest_LDADD = libsgmath.la $(base_LIBS)
++
++SGGeometryTest_SOURCES = SGGeometryTest.cxx
++SGGeometryTest_LDADD = libsgmath.la $(base_LIBS)
++
++lib_LTLIBRARIES = libsgmath.la
++
++include_HEADERS = \
++ interpolater.hxx \
++ leastsqs.hxx \
++ point3d.hxx \
++ polar3d.hxx \
++ sg_geodesy.hxx \
++ sg_random.h \
++ sg_types.hxx \
++ vector.hxx \
++ Math.hxx \
++ SGBox.hxx \
++ SGCMath.hxx \
++ SGGeoc.hxx \
++ SGGeod.hxx \
++ SGGeodesy.hxx \
++ SGGeometry.hxx \
++ SGGeometryFwd.hxx \
++ SGIntersect.hxx \
++ SGLimits.hxx \
++ SGLineSegment.hxx \
++ SGMatrix.hxx \
++ SGMath.hxx \
++ SGMathFwd.hxx \
++ SGMisc.hxx \
++ SGPlane.hxx \
++ SGQuat.hxx \
++ SGRay.hxx \
++ SGSphere.hxx \
++ SGTriangle.hxx \
++ SGVec2.hxx \
++ SGVec3.hxx \
++ SGVec4.hxx
++
++libsgmath_la_SOURCES = \
++ interpolater.cxx \
++ leastsqs.cxx \
++ sg_random.c \
++ vector.cxx \
++ SGGeod.cxx \
++ SGGeodesy.cxx
++
++INCLUDES = -I$(top_srcdir)
+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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/misc/Makefile.am 2009-08-11 18:11:32.000000000 +0200
+@@ -24,6 +24,14 @@
+ interpolator.cxx \
+ PathOptions.cxx
-+libsgscreen_la_LIBADD = \
++libsgmisc_la_LIBADD = \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ -lz -lplibssg
++ $(top_builddir)/simgear/structure/libsgstructure.la \
++ $(top_builddir)/simgear/props/libsgprops.la \
++ -lz \
++ -losg \
++ -losgDB
++
+ noinst_PROGRAMS = tabbed_value_test swap_test
+
+ tabbed_value_test_SOURCES = tabbed_values_test.cxx
+diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am.orig SimGear-1.9.1/simgear/misc/Makefile.am.orig
+--- SimGear-1.9.1.orig/simgear/misc/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100
++++ SimGear-1.9.1/simgear/misc/Makefile.am.orig 2009-08-11 18:09:26.000000000 +0200
+@@ -0,0 +1,43 @@
++includedir = @includedir@/misc
+
- if HAVE_GLUT
- noinst_PROGRAMS = TestRenderTexture
++lib_LTLIBRARIES = libsgmisc.la
++
++include_HEADERS = \
++ sg_path.hxx \
++ sgstream.hxx \
++ stopwatch.hxx \
++ strutils.hxx \
++ tabbed_values.hxx \
++ texcoord.hxx \
++ zfstream.hxx \
++ interpolator.hxx \
++ stdint.hxx \
++ PathOptions.hxx
++
++libsgmisc_la_SOURCES = \
++ sg_path.cxx \
++ sgstream.cxx \
++ strutils.cxx \
++ tabbed_values.cxx \
++ texcoord.cxx \
++ zfstream.cxx \
++ interpolator.cxx \
++ PathOptions.cxx
++
++noinst_PROGRAMS = tabbed_value_test swap_test
++
++tabbed_value_test_SOURCES = tabbed_values_test.cxx
++tabbed_value_test_LDADD = \
++ 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.la
++
++$(top_builddir)/simgear/debug/libsgdebug.a:
++ cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.la
++
++swap_test_SOURCES = swap_test.cpp
++
++INCLUDES = -I$(top_srcdir)
+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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/props/Makefile.am 2009-08-11 18:09:26.000000000 +0200
+@@ -12,6 +12,8 @@
+ props.cxx \
+ props_io.cxx
+
++libsgprops_la_LIBADD = \
++ $(top_builddir)/simgear/xml/libsgxml.la
---- SimGear-0.3.10/simgear/route/Makefile.am~ 2007-05-27 23:05:59.287884796 +0200
-+++ SimGear-0.3.10/simgear/route/Makefile.am 2007-05-27 23:08:36.070442820 +0200
+ # NOTE: Looped dependencies misc and props test files, commenting this one out
+ # noinst_PROGRAMS = props_test
+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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/route/Makefile.am 2009-08-11 18:09:26.000000000 +0200
@@ -8,6 +8,9 @@
route.cxx \
waypoint.cxx
INCLUDES = -I$(top_srcdir)
noinst_PROGRAMS = waytest routetest
---- SimGear-0.3.10/simgear/props/Makefile.am~ 2007-05-27 21:52:35.410553253 +0200
-+++ SimGear-0.3.10/simgear/props/Makefile.am 2007-05-27 21:55:39.894540760 +0200
-@@ -12,6 +12,8 @@
- props.cxx \
- props_io.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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/screen/Makefile.am 2009-08-11 18:09:26.000000000 +0200
+@@ -35,6 +35,10 @@
+ shader.cpp \
+ win32-printer.h
-+libsgprops_la_LIBADD = \
-+ $(top_builddir)/simgear/xml/libsgxml.la
++libsgscreen_la_LIBADD = \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
++ -lz -lplibssg
++
+ if HAVE_GLUT
+ noinst_PROGRAMS = TestRenderTexture
- # NOTE: Looped dependencies misc and props test files, commenting this one out
- # noinst_PROGRAMS = props_test
---- SimGear-0.3.10/simgear/sound/Makefile.am~ 2007-05-27 23:34:49.685625164 +0200
-+++ SimGear-0.3.10/simgear/sound/Makefile.am 2007-05-27 23:42:58.372038859 +0200
+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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/sound/Makefile.am 2009-08-11 18:09:26.000000000 +0200
@@ -16,6 +16,13 @@
soundmgr_openal.cxx \
xmlsound.cxx
noinst_PROGRAMS = openal_test1 openal_test2
openal_test1_SOURCES = openal_test1.cxx
---- SimGear-0.3.10/simgear/misc/Makefile.am~ 2007-05-27 21:50:20.566487449 +0200
-+++ SimGear-0.3.10/simgear/misc/Makefile.am 2007-05-27 21:55:08.796678047 +0200
-@@ -22,6 +22,12 @@
- zfstream.cxx \
- interpolator.cxx
-
-+libsgmisc_la_LIBADD = \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ -lz
-+
- noinst_PROGRAMS = tabbed_value_test swap_test
-
- tabbed_value_test_SOURCES = tabbed_values_test.cxx
---- SimGear-0.3.10/simgear/io/Makefile.am~ 2007-05-27 22:00:31.414505255 +0200
-+++ SimGear-0.3.10/simgear/io/Makefile.am 2007-05-27 22:13:53.776027440 +0200
-@@ -20,6 +20,14 @@
- sg_socket.cxx \
- sg_socket_udp.cxx
+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-08-11 14:39:56.000000000 +0200
++++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-11 18:09:26.000000000 +0200
+@@ -30,5 +30,9 @@
+ SGSmplhist.cxx \
+ SGSmplstat.cxx
-+libsgio_la_LIBADD = \
-+ $(top_builddir)/simgear/bucket/libsgbucket.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ -lplibnet \
++libsgstructure_la_LIBADD = \
++ $(top_builddir)/simgear/timing/libsgtiming.la \
+ -lz
+
INCLUDES = -I$(top_srcdir)
- noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
---- SimGear-0.3.10.clean_build/simgear/environment/Makefile.am.orig 2006-08-16 15:22:09.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/environment/Makefile.am 2006-08-16 15:14:48.000000000 -0700
+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_RANLIB
++AC_PROG_LIBTOOL
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ 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
+
+-lib_LIBRARIES = libsgbucket.a
++lib_LTLIBRARIES = libsgbucket.la
+
+ include_HEADERS = newbucket.hxx
+
+-libsgbucket_a_SOURCES = newbucket.cxx
++libsgbucket_la_SOURCES = newbucket.cxx
+
+ # noinst_PROGRAMS = testbucket
+
+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
+
+-lib_LIBRARIES = libsgdebug.a
++lib_LTLIBRARIES = libsgdebug.la
+
+ include_HEADERS = debug_types.h logstream.hxx
+
+-libsgdebug_a_SOURCES = logstream.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
+ include_HEADERS = metar.hxx visual_enviro.hxx precipitation.hxx
--libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx
-+libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx
+-libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
++libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10.clean_build/simgear/magvar/Makefile.am.orig 2006-08-16 15:23:27.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/magvar/Makefile.am 2006-08-16 15:14:48.000000000 -0700
-@@ -1,10 +1,10 @@
- includedir = @includedir@/magvar
-
--lib_LIBRARIES = libsgmagvar.a
-+lib_LTLIBRARIES = libsgmagvar.la
-
- include_HEADERS = magvar.hxx
-
--libsgmagvar_a_SOURCES = \
-+libsgmagvar_la_SOURCES = \
- coremag.hxx coremag.cxx \
- magvar.cxx
+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
-@@ -13,7 +13,7 @@
- testmagvar_SOURCES = testmagvar.cxx
+-lib_LIBRARIES = libsgephem.a
++lib_LTLIBRARIES = libsgephem.la
- testmagvar_LDADD = \
-- $(top_builddir)/simgear/magvar/libsgmagvar.a \
-+ $(top_builddir)/simgear/magvar/libsgmagvar.la \
- $(base_LIBS)
+ include_HEADERS = \
+ celestialBody.hxx \
+@@ -16,7 +16,7 @@
+ uranus.hxx \
+ venus.hxx
- INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10.clean_build/simgear/io/Makefile.am.orig 2006-08-16 15:23:05.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/io/Makefile.am 2006-08-16 15:14:49.000000000 -0700
+-libsgephem_a_SOURCES = \
++libsgephem_la_SOURCES = \
+ celestialBody.cxx \
+ ephemeris.cxx \
+ jupiter.cxx \
+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 \
-@@ -27,10 +27,14 @@
+@@ -27,10 +27,10 @@
tcp_server_SOURCES = tcp_server.cxx
tcp_server_LDADD = \
-- $(top_builddir)/simgear/io/libsgio.a \
+- libsgio.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
- $(top_builddir)/simgear/bucket/libsgbucket.a \
- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ $(top_builddir)/simgear/io/libsgio.la \
++ libsgio.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-lplibnet -lplibul -lz \
$(network_LIBS) \
$(base_LIBS)
-@@ -38,10 +42,14 @@
+@@ -38,10 +38,10 @@
tcp_client_SOURCES = tcp_client.cxx
tcp_client_LDADD = \
-- $(top_builddir)/simgear/io/libsgio.a \
+- libsgio.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
- $(top_builddir)/simgear/bucket/libsgbucket.a \
- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ $(top_builddir)/simgear/io/libsgio.la \
++ libsgio.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-lplibnet -lplibul -lz \
$(network_LIBS) \
$(base_LIBS)
-@@ -49,10 +57,15 @@
+@@ -49,10 +49,10 @@
socktest_SOURCES = socktest.cxx
socktest_LDADD = \
-- $(top_builddir)/simgear/io/libsgio.a \
+- libsgio.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
- $(top_builddir)/simgear/bucket/libsgbucket.a \
- $(top_builddir)/simgear/misc/libsgmisc.a \
-+ $(top_builddir)/simgear/io/libsgio.la \
++ libsgio.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-lplibnet -lplibul -lz \
$(network_LIBS) \
$(base_LIBS)
-@@ -60,17 +73,25 @@
+@@ -60,17 +60,17 @@
lowtest_SOURCES = lowtest.cxx
lowtest_LDADD = \
-- $(top_builddir)/simgear/io/libsgio.a \
+- libsgio.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
- $(top_builddir)/simgear/bucket/libsgbucket.a \
- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(base_LIBS) -lz
-+ $(top_builddir)/simgear/io/libsgio.la \
++ libsgio.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(base_LIBS) -lz -lplibnet -lplibul
+ $(base_LIBS) -lz
decode_binobj_SOURCES = decode_binobj.cxx
decode_binobj_LDADD = \
-- $(top_builddir)/simgear/io/libsgio.a \
+- libsgio.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
- $(top_builddir)/simgear/bucket/libsgbucket.a \
- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(base_LIBS) -lz
-+ $(top_builddir)/simgear/io/libsgio.la \
++ libsgio.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(top_builddir)/simgear/serial/libsgserial.la \
-+ $(base_LIBS) -lz -lplibnet -lplibul
---- SimGear-0.3.10.clean_build/simgear/bucket/Makefile.am.orig 2006-08-16 15:21:20.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/bucket/Makefile.am 2006-08-16 15:14:49.000000000 -0700
+ $(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@/bucket
-
--lib_LIBRARIES = libsgbucket.a
-+lib_LTLIBRARIES = libsgbucket.la
-
- include_HEADERS = newbucket.hxx
+ includedir = @includedir@/magvar
--libsgbucket_a_SOURCES = newbucket.cxx
-+libsgbucket_la_SOURCES = newbucket.cxx
+-lib_LIBRARIES = libsgmagvar.a
++lib_LTLIBRARIES = libsgmagvar.la
- # noinst_PROGRAMS = testbucket
+ include_HEADERS = magvar.hxx
---- SimGear-0.3.10.clean_build/simgear/xml/Makefile.am.orig 2006-08-16 15:28:33.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/xml/Makefile.am 2006-08-16 15:14:49.000000000 -0700
-@@ -1,6 +1,6 @@
- includedir = @includedir@/xml
+-libsgmagvar_a_SOURCES = \
++libsgmagvar_la_SOURCES = \
+ coremag.hxx coremag.cxx \
+ magvar.cxx
--lib_LIBRARIES = libsgxml.a
-+lib_LTLIBRARIES = libsgxml.la
+@@ -13,7 +13,7 @@
+ testmagvar_SOURCES = testmagvar.cxx
- include_HEADERS = \
- easyxml.hxx
-@@ -8,7 +8,7 @@
- noinst_HEADERS = \
- xmltok_impl.c xmltok_ns.c
+ testmagvar_LDADD = \
+- libsgmagvar.a \
++ libsgmagvar.la \
+ $(base_LIBS)
--libsgxml_a_SOURCES = \
-+libsgxml_la_SOURCES = \
- asciitab.h \
- easyxml.cxx \
- hashtable.h hashtable.c \
---- SimGear-0.3.10.clean_build/simgear/debug/Makefile.am.orig 2006-08-16 15:21:47.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/debug/Makefile.am 2006-08-16 15:14:49.000000000 -0700
-@@ -2,10 +2,10 @@
+ INCLUDES = -I$(top_srcdir)
+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 \
+- misc \
++ timing \
+ structure \
++ props \
++ misc \
+ bucket \
+ ephemeris \
++ serial \
+ io \
+ magvar \
+ math \
+ $(METAR_DIRS) \
+ nasal \
+- props \
+ route \
+ scene \
+ screen \
+- serial \
+ sound \
+- $(SGTHREAD_DIR) \
+- timing
++ $(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)
- EXTRA_DIST = logtest.cxx
+ SGMathTest_SOURCES = SGMathTest.cxx
+-SGMathTest_LDADD = libsgmath.a $(base_LIBS)
++SGMathTest_LDADD = libsgmath.la $(base_LIBS)
--lib_LIBRARIES = libsgdebug.a
-+lib_LTLIBRARIES = libsgdebug.la
+ SGGeometryTest_SOURCES = SGGeometryTest.cxx
+-SGGeometryTest_LDADD = libsgmath.a $(base_LIBS)
++SGGeometryTest_LDADD = libsgmath.la $(base_LIBS)
- include_HEADERS = debug_types.h logstream.hxx
+-lib_LIBRARIES = libsgmath.a
++lib_LTLIBRARIES = libsgmath.la
--libsgdebug_a_SOURCES = logstream.cxx
-+libsgdebug_la_SOURCES = logstream.cxx
+ include_HEADERS = \
+ interpolater.hxx \
+@@ -44,7 +44,7 @@
+ SGVec3.hxx \
+ SGVec4.hxx
- INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10.clean_build/simgear/misc/Makefile.am.orig 2006-08-16 15:23:58.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/misc/Makefile.am 2006-08-16 15:14:49.000000000 -0700
+-libsgmath_a_SOURCES = \
++libsgmath_la_SOURCES = \
+ interpolater.cxx \
+ leastsqs.cxx \
+ 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
include_HEADERS = \
sg_path.hxx \
-@@ -13,7 +13,7 @@
- interpolator.hxx \
- stdint.hxx
+@@ -14,7 +14,7 @@
+ stdint.hxx \
+ PathOptions.hxx
-libsgmisc_a_SOURCES = \
+libsgmisc_la_SOURCES = \
sg_path.cxx \
sgstream.cxx \
strutils.cxx \
-@@ -26,9 +26,12 @@
+@@ -28,15 +28,15 @@
tabbed_value_test_SOURCES = tabbed_values_test.cxx
tabbed_value_test_LDADD = \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
+- libsgmisc.a \
- $(top_builddir)/simgear/xml/libsgxml.a \
- $(top_builddir)/simgear/debug/libsgdebug.a
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
++ libsgmisc.la \
+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ -lz
-
- swap_test_SOURCES = swap_test.cpp
-
---- SimGear-0.3.10.clean_build/simgear/ephemeris/Makefile.am.orig 2006-08-16 15:22:44.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/ephemeris/Makefile.am 2006-08-16 15:14:50.000000000 -0700
-@@ -1,6 +1,6 @@
- includedir = @includedir@/ephemeris
-
--lib_LIBRARIES = libsgephem.a
-+lib_LTLIBRARIES = libsgephem.la
-
- include_HEADERS = \
- celestialBody.hxx \
-@@ -16,7 +16,7 @@
- uranus.hxx \
- venus.hxx
-
--libsgephem_a_SOURCES = \
-+libsgephem_la_SOURCES = \
- celestialBody.cxx \
- ephemeris.cxx \
- jupiter.cxx \
---- SimGear-0.3.10.clean_build/simgear/sound/Makefile.am.orig 2006-08-16 15:27:06.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/sound/Makefile.am 2006-08-16 15:14:50.000000000 -0700
-@@ -2,7 +2,7 @@
-
- EXTRA_DIST = jet.wav
-
--lib_LIBRARIES = libsgsound.a
-+lib_LTLIBRARIES = libsgsound.la
-
- noinst_HEADERS =
-
-@@ -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,17 @@
- openal_test2_SOURCES = openal_test2.cxx
-
- openal_test1_LDADD = \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
- $(openal_LIBS)
++ $(top_builddir)/simgear/debug/libsgdebug.la
- openal_test2_LDADD = \
-- $(top_builddir)/simgear/sound/libsgsound.a \
-- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(top_builddir)/simgear/misc/libsgmisc.a \
-- $(top_builddir)/simgear/structure/libsgstructure.a \
-- $(openal_LIBS)
-+ $(top_builddir)/simgear/sound/libsgsound.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(openal_LIBS) \
-+ -lz
+ $(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
- INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10.clean_build/simgear/threads/Makefile.am.orig 2006-08-16 15:28:10.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/threads/Makefile.am 2006-08-16 15:14:50.000000000 -0700
-@@ -1,13 +1,13 @@
- includedir = @includedir@/threads
+ $(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
--lib_LIBRARIES = libsgthreads.a
-+lib_LTLIBRARIES = libsgthreads.la
+ swap_test_SOURCES = swap_test.cpp
- include_HEADERS = \
- SGGuard.hxx \
- SGQueue.hxx \
- SGThread.hxx
+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
--libsgthreads_a_SOURCES = \
-+libsgthreads_la_SOURCES = \
- SGThread.cxx
+-lib_LIBRARIES = libsgnasal.a
++lib_LTLIBRARIES = libsgnasal.la
- INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10.clean_build/simgear/props/Makefile.am.orig 2006-08-16 15:24:35.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/props/Makefile.am 2006-08-16 15:14:50.000000000 -0700
-@@ -1,13 +1,13 @@
+ 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
condition.cxx \
props.cxx \
props_io.cxx
-@@ -16,10 +16,11 @@
- props_test_SOURCES = props_test.cxx
- props_test_LDADD = \
-- $(top_builddir)/simgear/props/libsgprops.a \
+-noinst_PROGRAMS = props_test
+
+-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
-+ $(top_builddir)/simgear/props/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 \
-+ -lz
++# 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
INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10.clean_build/simgear/structure/Makefile.am.orig 2006-08-16 15:27:48.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/structure/Makefile.am 2006-08-16 15:14:51.000000000 -0700
-@@ -1,6 +1,6 @@
- includedir = @includedir@/structure
-
--lib_LIBRARIES = libsgstructure.a
-+lib_LTLIBRARIES = libsgstructure.la
-
- include_HEADERS = \
- callback.hxx \
-@@ -12,7 +12,7 @@
- SGReferenced.hxx \
- SGSharedPtr.hxx
-
--libsgstructure_a_SOURCES = \
-+libsgstructure_la_SOURCES = \
- commands.cxx \
- exception.cxx \
- event_mgr.cxx\
---- SimGear-0.3.10.clean_build/simgear/timing/Makefile.am.orig 2006-08-16 15:28:24.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/timing/Makefile.am 2006-08-16 15:14:51.000000000 -0700
-@@ -1,6 +1,6 @@
- includedir = @includedir@/timing
-
--lib_LIBRARIES = libsgtiming.a
-+lib_LTLIBRARIES = libsgtiming.la
-
- include_HEADERS = \
- geocoord.h \
-@@ -9,7 +9,7 @@
- timestamp.hxx \
- timezone.h
-
--libsgtiming_a_SOURCES = \
-+libsgtiming_la_SOURCES = \
- geocoord.cxx \
- lowleveltime.cxx \
- sg_time.cxx \
---- SimGear-0.3.10.clean_build/simgear/nasal/Makefile.am.orig 2006-08-16 15:24:15.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/nasal/Makefile.am 2006-08-16 15:14:51.000000000 -0700
-@@ -1,10 +1,10 @@
- includedir = @includedir@/nasal
-
--lib_LIBRARIES = libsgnasal.a
-+lib_LTLIBRARIES = libsgnasal.la
-
- include_HEADERS = nasal.h
-
--libsgnasal_a_SOURCES = \
-+libsgnasal_la_SOURCES = \
- code.c code.h \
- codegen.c \
- data.h \
---- SimGear-0.3.10.clean_build/simgear/route/Makefile.am.orig 2006-08-16 15:24:50.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/route/Makefile.am 2006-08-16 15:14:51.000000000 -0700
-@@ -1,10 +1,10 @@
- includedir = @includedir@/route
+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
-lib_LIBRARIES = libsgroute.a
+lib_LTLIBRARIES = libsgroute.la
route.cxx \
waypoint.cxx
-@@ -15,17 +15,25 @@
+@@ -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/route/libsgroute.la \
+- $(top_builddir)/simgear/props/libsgprops.a \
+- $(top_builddir)/simgear/structure/libsgstructure.a \
+- $(top_builddir)/simgear/xml/libsgxml.a \
++ libsgroute.la \
+ $(top_builddir)/simgear/math/libsgmath.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.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 \
-- $(base_LIBS)
-+ $(top_builddir)/simgear/route/libsgroute.la \
+- $(top_builddir)/simgear/structure/libsgstructure.a \
++ libsgroute.la \
+ $(top_builddir)/simgear/math/libsgmath.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(base_LIBS) \
-+ -lz
---- SimGear-0.3.10.clean_build/simgear/screen/Makefile.am.orig 2006-08-16 15:26:15.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/screen/Makefile.am 2006-08-16 15:14:51.000000000 -0700
+ $(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
texture.cxx \
GLBitmaps.cxx \
$(IMAGE_SERVER_SRCS) \
-@@ -41,9 +41,10 @@
+@@ -41,8 +41,8 @@
TestRenderTexture_SOURCES = TestRenderTexture.cpp
TestRenderTexture_LDADD = \
-- $(top_builddir)/simgear/screen/libsgscreen.a \
+- libsgscreen.a \
- $(top_builddir)/simgear/debug/libsgdebug.a \
-- $(opengl_LIBS)
-+ $(top_builddir)/simgear/screen/libsgscreen.la \
++ libsgscreen.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(opengl_LIBS) -lz \
-+ -lplibssg -lplibsg -lplibul
+ $(opengl_LIBS)
endif
- INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
---- SimGear-0.3.10.clean_build/simgear/math/Makefile.am.orig 2006-08-16 15:23:41.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/math/Makefile.am 2006-08-16 15:14:52.000000000 -0700
-@@ -5,10 +5,10 @@
- TESTS = $(check_PROGRAMS)
-
- SGMathTest_SOURCES = SGMathTest.cxx
--SGMathTest_LDADD = libsgmath.a $(base_LIBS)
-+# SGMathTest_LDADD = libsgmath.a $(base_LIBS)
-+SGMathTest_LDADD = libsgmath.la $(base_LIBS) -lz
-
--
--lib_LIBRARIES = libsgmath.a
-+lib_LTLIBRARIES = libsgmath.la
-
- include_HEADERS = \
- interpolater.hxx \
-@@ -35,7 +35,7 @@
-
- EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
-
--libsgmath_a_SOURCES = \
-+libsgmath_la_SOURCES = \
- interpolater.cxx \
- leastsqs.cxx \
- polar3d.cxx \
---- SimGear-0.3.10.clean_build/simgear/serial/Makefile.am.orig 2006-08-16 15:26:43.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/serial/Makefile.am 2006-08-16 15:14:52.000000000 -0700
+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
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)
---- SimGear-0.3.10.clean_build/simgear/Makefile.am.orig 2006-08-16 15:21:09.000000000 -0700
-+++ SimGear-0.3.10.clean_build/simgear/Makefile.am 2006-08-16 15:14:49.000000000 -0700
-@@ -16,20 +16,20 @@
- $(compatibility_DIR) \
- xml \
- debug \
-- misc \
- structure \
-+ props \
-+ misc \
- bucket \
- ephemeris \
-+ serial \
- io \
- magvar \
- math \
- $(METAR_DIRS) \
- nasal \
-- props \
- route \
- scene \
- screen \
-- serial \
- sound \
- $(SGTHREAD_DIR) \
- timing
---- SimGear-0.3.10.clean_build/configure.ac.orig 2006-08-16 15:19:32.000000000 -0700
-+++ SimGear-0.3.10.clean_build/configure.ac 2006-08-16 15:14:48.000000000 -0700
-@@ -32,7 +32,7 @@
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_CXX
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AC_PROG_INSTALL
- AC_PROG_LN_S
-
---- SimGear-0.3.10/simgear/props/Makefile.am.orig 2006-08-16 16:03:23.000000000 -0700
-+++ SimGear-0.3.10/simgear/props/Makefile.am 2006-08-16 16:09:13.000000000 -0700
-@@ -12,15 +12,19 @@
- props.cxx \
- props_io.cxx
+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 @@
--noinst_PROGRAMS = props_test
+ EXTRA_DIST = jet.wav
--props_test_SOURCES = props_test.cxx
--props_test_LDADD = \
-- $(top_builddir)/simgear/props/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 \
-- -lz
-+# 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 = \
-+# $(top_builddir)/simgear/props/libsgprops.la \
-+# $(top_builddir)/simgear/xml/libsgxml.la \
-+# $(top_builddir)/simgear/debug/libsgdebug.la \
-+# $(top_builddir)/simgear/structure/libsgstructure.la \
-+# $(top_builddir)/simgear/misc/libsgmisc.la \
-+# -lz
-+
+-lib_LIBRARIES = libsgsound.a
++lib_LTLIBRARIES = libsgsound.la
- INCLUDES = -I$(top_srcdir)
---- SimGear-0.3.10/simgear/math/Makefile.am.orig 2006-08-16 16:20:04.000000000 -0700
-+++ SimGear-0.3.10/simgear/math/Makefile.am 2006-08-16 16:27:17.000000000 -0700
-@@ -5,8 +5,14 @@
- TESTS = $(check_PROGRAMS)
+ noinst_HEADERS =
- SGMathTest_SOURCES = SGMathTest.cxx
--# SGMathTest_LDADD = libsgmath.a $(base_LIBS)
--SGMathTest_LDADD = libsgmath.la $(base_LIBS) -lz
-+
-+SGMathTest_LDADD = libsgmath.la \
-+ $(top_builddir)/simgear/misc/libsgmisc.la \
-+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/props/libsgprops.la \
-+ $(top_builddir)/simgear/debug/libsgdebug.la \
-+ $(top_builddir)/simgear/xml/libsgxml.la \
-+ $(base_LIBS) -lz
-
- lib_LTLIBRARIES = libsgmath.la
-
---- SimGear-0.3.10/simgear/scene/model/Makefile.am.orig 2006-08-16 15:54:15.000000000 -0700
-+++ SimGear-0.3.10/simgear/scene/model/Makefile.am 2006-08-16 16:18:45.000000000 -0700
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/model
+@@ -11,7 +11,7 @@
+ soundmgr_openal.hxx \
+ xmlsound.hxx
--lib_LIBRARIES = libsgmodel.a
-+lib_LTLIBRARIES = libsgmodel.la
+-libsgsound_a_SOURCES = \
++libsgsound_la_SOURCES = \
+ sample_openal.cxx \
+ soundmgr_openal.cxx \
+ xmlsound.cxx
+@@ -22,14 +22,14 @@
+ openal_test2_SOURCES = openal_test2.cxx
- noinst_HEADERS =
+ openal_test1_LDADD = \
+- $(top_builddir)/simgear/debug/libsgdebug.a \
++ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(openal_LIBS)
-@@ -15,7 +15,7 @@
- placementtrans.hxx \
- shadowvolume.hxx
+ 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)
--libsgmodel_a_SOURCES = \
-+libsgmodel_la_SOURCES = \
- animation.cxx \
- custtrans.cxx \
- location.cxx \
---- SimGear-0.3.10/simgear/scene/material/Makefile.am.orig 2006-08-16 15:54:15.000000000 -0700
-+++ SimGear-0.3.10/simgear/scene/material/Makefile.am 2006-08-16 16:13:10.000000000 -0700
+ 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@/scene/material
+ includedir = @includedir@/structure
--lib_LIBRARIES = libsgmaterial.a
-+lib_LTLIBRARIES = libsgmaterial.la
+-lib_LIBRARIES = libsgstructure.a
++lib_LTLIBRARIES = libsgstructure.la
- noinst_HEADERS =
+ include_HEADERS = \
+ callback.hxx \
+@@ -19,7 +19,7 @@
+ SGSmplstat.hxx \
+ Singleton.hxx
-@@ -9,7 +9,7 @@
- matlib.hxx \
- matmodel.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
--libsgmaterial_a_SOURCES = \
-+libsgmaterial_la_SOURCES = \
- mat.cxx \
- matlib.cxx \
- matmodel.cxx
---- SimGear-0.3.10/simgear/scene/tgdb/Makefile.am.orig 2006-08-16 15:54:15.000000000 -0700
-+++ SimGear-0.3.10/simgear/scene/tgdb/Makefile.am 2006-08-16 16:27:40.000000000 -0700
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/tgdb
+-lib_LIBRARIES = libsgthreads.a
++lib_LTLIBRARIES = libsgthreads.la
--lib_LIBRARIES = libsgtgdb.a
-+lib_LTLIBRARIES = libsgtgdb.la
+ include_HEADERS = \
+ SGGuard.hxx \
+ SGQueue.hxx \
+ SGThread.hxx
- noinst_HEADERS =
+-libsgthreads_a_SOURCES = \
++libsgthreads_la_SOURCES = \
+ SGThread.cxx
-@@ -12,7 +12,7 @@
- userdata.hxx \
- vasi.hxx
+ 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
--libsgtgdb_a_SOURCES = \
-+libsgtgdb_la_SOURCES = \
- apt_signs.cxx \
- leaf.cxx \
- obj.cxx \
---- SimGear-0.3.10/simgear/scene/sky/Makefile.am.orig 2006-08-16 15:54:15.000000000 -0700
-+++ SimGear-0.3.10/simgear/scene/sky/Makefile.am 2006-08-16 16:23:01.000000000 -0700
+-lib_LIBRARIES = libsgtiming.a
++lib_LTLIBRARIES = libsgtiming.la
+
+ include_HEADERS = \
+ geocoord.h \
+@@ -9,7 +9,7 @@
+ timestamp.hxx \
+ timezone.h
+
+-libsgtiming_a_SOURCES = \
++libsgtiming_la_SOURCES = \
+ geocoord.cxx \
+ lowleveltime.cxx \
+ sg_time.cxx \
+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@/scene/sky
+ includedir = @includedir@/xml
--lib_LIBRARIES = libsgsky.a
-+lib_LTLIBRARIES = libsgsky.la
+-lib_LIBRARIES = libsgxml.a
++lib_LTLIBRARIES = libsgxml.la
include_HEADERS = \
- cloud.hxx \
-@@ -14,7 +14,7 @@
- cloudfield.hxx \
- newcloud.hxx
+ easyxml.hxx
+@@ -8,7 +8,7 @@
+ noinst_HEADERS = \
+ xmltok_impl.c xmltok_ns.c
--libsgsky_a_SOURCES = \
-+libsgsky_la_SOURCES = \
- cloud.cxx \
- dome.cxx \
- moon.cxx \
+-libsgxml_a_SOURCES = \
++libsgxml_la_SOURCES = \
+ asciitab.h \
+ easyxml.cxx \
+ hashtable.h hashtable.c \
projects / packages / SimGear.git / commitdiff