Blob Blame Raw
diff -uNrp SimGear-2.0.0.orig/configure.ac SimGear-2.0.0/configure.ac
--- SimGear-2.0.0.orig/configure.ac	2010-02-17 16:56:16.000000000 +0100
+++ SimGear-2.0.0/configure.ac	2010-02-26 22:35:25.640250523 +0100
@@ -3,6 +3,7 @@ dnl script.
 
 AC_INIT
 AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx])
+AC_PROG_LIBTOOL
 
 dnl Require at least automake 2.52
 AC_PREREQ(2.52)
diff -uNrp SimGear-2.0.0.orig/simgear/bucket/Makefile.am SimGear-2.0.0/simgear/bucket/Makefile.am
--- SimGear-2.0.0.orig/simgear/bucket/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/bucket/Makefile.am	2010-02-26 22:35:25.640250523 +0100
@@ -1,10 +1,11 @@
 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
+libsgbucket_la_LDFLAGS = -release @VERSION@ -module
 
 # noinst_PROGRAMS = testbucket
 
diff -uNrp SimGear-2.0.0.orig/simgear/debug/Makefile.am SimGear-2.0.0/simgear/debug/Makefile.am
--- SimGear-2.0.0.orig/simgear/debug/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/debug/Makefile.am	2010-02-26 22:35:25.641260714 +0100
@@ -2,10 +2,11 @@ includedir = @includedir@/debug
 
 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
+libsgdebug_la_LDFLAGS = -release @VERSION@ -module
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/environment/Makefile.am SimGear-2.0.0/simgear/environment/Makefile.am
--- SimGear-2.0.0.orig/simgear/environment/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/environment/Makefile.am	2010-02-26 22:35:25.641260714 +0100
@@ -1,9 +1,16 @@
 includedir = @includedir@/environment
 
-lib_LIBRARIES = libsgenvironment.a
+lib_LTLIBRARIES = libsgenvironment.la
 
 include_HEADERS = metar.hxx visual_enviro.hxx precipitation.hxx
 
-libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
+libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx
+libsgenvironment_la_LDFLAGS = -release @VERSION@ -module -lGL -lplibssg
+libsgenvironment_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/sound/libsgsound.la \
+	$(top_builddir)/simgear/math/libsgmath.la
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/ephemeris/Makefile.am SimGear-2.0.0/simgear/ephemeris/Makefile.am
--- SimGear-2.0.0.orig/simgear/ephemeris/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/ephemeris/Makefile.am	2010-02-26 22:35:25.641260714 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/ephemeris
 
-lib_LIBRARIES = libsgephem.a
+lib_LTLIBRARIES = libsgephem.la
 
 include_HEADERS = \
 	celestialBody.hxx \
@@ -16,7 +16,7 @@ include_HEADERS = \
 	uranus.hxx \
 	venus.hxx
 
-libsgephem_a_SOURCES = \
+libsgephem_la_SOURCES = \
 	celestialBody.cxx \
 	ephemeris.cxx \
 	jupiter.cxx \
@@ -31,4 +31,10 @@ libsgephem_a_SOURCES = \
 	uranus.cxx \
 	venus.cxx
 
+libsgephem_la_LDFLAGS = -release @VERSION@ -module
+
+libsgephem_la_LIBADD = \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/io/Makefile.am SimGear-2.0.0/simgear/io/Makefile.am
--- SimGear-2.0.0.orig/simgear/io/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/io/Makefile.am	2010-02-26 22:35:25.641260714 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/io
 
-lib_LIBRARIES = libsgio.a
+lib_LTLIBRARIES = libsgio.la
 
 include_HEADERS = \
 	iochannel.hxx \
@@ -11,7 +11,7 @@ include_HEADERS = \
 	sg_socket.hxx \
 	sg_socket_udp.hxx
 
-libsgio_a_SOURCES = \
+libsgio_la_SOURCES = \
 	iochannel.cxx \
 	lowlevel.cxx \
 	sg_binobj.cxx \
@@ -22,6 +22,13 @@ libsgio_a_SOURCES = \
 
 INCLUDES = -I$(top_srcdir)
 
+libsgio_la_LDFLAGS = -release @VERSION@ -module -lplibnet -lz
+
+libsgio_la_LIBADD = \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la
+
 noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client
 
 tcp_server_SOURCES = tcp_server.cxx
@@ -30,16 +37,20 @@ if HAVE_FRAMEWORK_PLIB
 tcp_server_LDFLAGS = $(plib_FRAMEWORK)
 else
 tcp_server_PLIB_LIBS = -lplibnet -lplibul
-endif
 
-tcp_server_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+tcp_server_LDFLAGS = \
+	$(top_builddir)/simgear/io/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 \
 	$(tcp_server_PLIB_LIBS) -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
+endif
 
 tcp_client_SOURCES = tcp_client.cxx
 
@@ -47,16 +58,20 @@ if HAVE_FRAMEWORK_PLIB
 tcp_client_LDFLAGS = $(plib_FRAMEWORK)
 else
 tcp_client_PLIB_LIBS = -lplibnet -lplibul
-endif
 
-tcp_client_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+tcp_client_LDFLAGS = \
+	$(top_builddir)/simgear/io/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 \
 	$(tcp_client_PLIB_LIBS) -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
+endif
 
 socktest_SOURCES = socktest.cxx
 
@@ -64,31 +79,43 @@ if HAVE_FRAMEWORK_PLIB
 socktest_LDFLAGS = $(plib_FRAMEWORK)
 else
 socktest_PLIB_LIBS = -lplibnet -lplibul
-endif
 
-socktest_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+socktest_LDFLAGS = \
+	$(top_builddir)/simgear/io/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 \
         $(socktest_PLIB_LIBS) -lz \
 	$(network_LIBS) \
 	$(base_LIBS) 
+endif
 
 lowtest_SOURCES = lowtest.cxx
 
-lowtest_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+lowtest_LDFLAGS = \
+	$(top_builddir)/simgear/io/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
 
 decode_binobj_SOURCES = decode_binobj.cxx
 
-decode_binobj_LDADD = \
-	libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
+decode_binobj_LDFLAGS = \
+	$(top_builddir)/simgear/io/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
diff -uNrp SimGear-2.0.0.orig/simgear/magvar/Makefile.am SimGear-2.0.0/simgear/magvar/Makefile.am
--- SimGear-2.0.0.orig/simgear/magvar/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/magvar/Makefile.am	2010-02-26 22:35:25.642240313 +0100
@@ -1,17 +1,19 @@
 includedir = @includedir@/magvar
 
-lib_LIBRARIES = libsgmagvar.a
+lib_LTLIBRARIES = libsgmagvar.la
 
 include_HEADERS = magvar.hxx coremag.hxx
 
-libsgmagvar_a_SOURCES = coremag.cxx magvar.cxx
+libsgmagvar_la_SOURCES = coremag.cxx magvar.cxx
+
+libsgmagvar_la_LDFLAGS = -release @VERSION@ -module
 
 noinst_PROGRAMS = testmagvar
 
 testmagvar_SOURCES = testmagvar.cxx
 
-testmagvar_LDADD = \
-	libsgmagvar.a \
+testmagvar_LDFLAGS = \
+	$(top_builddir)/simgear/magvar/libsgmagvar.la \
 	$(base_LIBS)
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/Makefile.am SimGear-2.0.0/simgear/Makefile.am
--- SimGear-2.0.0.orig/simgear/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/Makefile.am	2010-02-26 22:35:25.642240313 +0100
@@ -8,23 +8,28 @@ include_HEADERS = \
 
 SUBDIRS = \
 	$(compatibility_DIR) \
-	xml \
 	debug \
-	misc \
 	structure \
+	xml \
+	props \
+	misc \
 	bucket \
 	ephemeris \
+	serial \
 	io \
 	magvar \
 	math \
+	sound \
+	screen \
 	$(METAR_DIRS) \
+	scene/model \
+	scene/tgdb \
+	scene/material \
+	scene/util \
+	scene/sky \
+	scene/bvh \
 	nasal \
-	props \
 	route \
-	scene \
-	screen \
-	serial \
-	sound \
 	threads \
 	timing
 
diff -uNrp SimGear-2.0.0.orig/simgear/math/Makefile.am SimGear-2.0.0/simgear/math/Makefile.am
--- SimGear-2.0.0.orig/simgear/math/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/math/Makefile.am	2010-02-26 22:35:25.642240313 +0100
@@ -4,12 +4,20 @@ check_PROGRAMS  = SGMathTest SGGeometryT
 TESTS           = $(check_PROGRAMS)
 
 SGMathTest_SOURCES = SGMathTest.cxx
-SGMathTest_LDADD = libsgmath.a -lsgstructure $(base_LIBS)
+SGMathTest_LDFLAGS = $(top_builddir)/simgear/io/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 \
+		     libsgmath.la $(base_LIBS) -lz -lplibnet -lplibul
 
 SGGeometryTest_SOURCES = SGGeometryTest.cxx
-SGGeometryTest_LDADD = libsgmath.a -lsgstructure $(base_LIBS)
+SGGeometryTest_LDFLAGS = libsgmath.la $(base_LIBS)
 
-lib_LIBRARIES = libsgmath.a
+lib_LTLIBRARIES = libsgmath.la
 
 include_HEADERS = \
 	interpolater.hxx \
@@ -45,7 +53,7 @@ include_HEADERS = \
 	SGVec4.hxx \
 	beziercurve.hxx
 
-libsgmath_a_SOURCES = \
+libsgmath_la_SOURCES = \
 	interpolater.cxx \
 	leastsqs.cxx \
 	sg_random.c \
@@ -53,4 +61,11 @@ libsgmath_a_SOURCES = \
 	SGGeod.cxx \
 	SGGeodesy.cxx
 
+libsgmath_la_LDFLAGS = -release @VERSION@ -module
+
+libsgmath_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/props/libsgprops.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/misc/Makefile.am SimGear-2.0.0/simgear/misc/Makefile.am
--- SimGear-2.0.0.orig/simgear/misc/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/misc/Makefile.am	2010-02-26 22:35:25.642240313 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/misc
 
-lib_LIBRARIES = libsgmisc.a
+lib_LTLIBRARIES = libsgmisc.la
 
 include_HEADERS = \
 	sg_path.hxx \
@@ -14,7 +14,7 @@ include_HEADERS = \
 	stdint.hxx \
 	PathOptions.hxx
 
-libsgmisc_a_SOURCES = \
+libsgmisc_la_SOURCES = \
 	sg_path.cxx \
 	sgstream.cxx \
 	strutils.cxx \
@@ -24,6 +24,13 @@ libsgmisc_a_SOURCES = \
 	interpolator.cxx \
 	PathOptions.cxx
 
+libsgmisc_la_LDFLAGS = -release @VERSION@ -module
+
+libsgmisc_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	-losg -losgDB -lz
+
 #noinst_PROGRAMS = tabbed_value_test swap_test
 
 #tabbed_value_test_SOURCES = tabbed_values_test.cxx
@@ -32,12 +39,6 @@ libsgmisc_a_SOURCES = \
 #	$(top_builddir)/simgear/xml/libsgxml.a \
 #	$(top_builddir)/simgear/debug/libsgdebug.a
 
-$(top_builddir)/simgear/xml/libsgxml.a:
-	cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a
-
-$(top_builddir)/simgear/debug/libsgdebug.a:
-	cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a
-
 #swap_test_SOURCES = swap_test.cpp
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/nasal/Makefile.am SimGear-2.0.0/simgear/nasal/Makefile.am
--- SimGear-2.0.0.orig/simgear/nasal/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/nasal/Makefile.am	2010-02-26 22:35:25.643240307 +0100
@@ -1,13 +1,15 @@
 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	\
-                       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	\
-                       utf8lib.c vector.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	\
+                        utf8lib.c vector.c
+
+libsgnasal_la_LDFLAGS = -release @VERSION@ -module -lm -lpthread
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/props/Makefile.am SimGear-2.0.0/simgear/props/Makefile.am
--- SimGear-2.0.0.orig/simgear/props/Makefile.am	2010-02-17 16:56:16.000000000 +0100
+++ SimGear-2.0.0/simgear/props/Makefile.am	2010-02-26 22:37:31.973241764 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/props
 
-lib_LIBRARIES = libsgprops.a
+lib_LTLIBRARIES = libsgprops.la
 
 include_HEADERS = \
 	condition.hxx \
@@ -9,26 +9,17 @@ include_HEADERS = \
 	AtomicChangeListener.hxx \
 	ExtendedPropertyAdapter.hxx
 
-libsgprops_a_SOURCES = \
+libsgprops_la_SOURCES = \
 	condition.cxx \
 	props.cxx \
 	props_io.cxx \
 	AtomicChangeListener.cxx
 
-noinst_PROGRAMS = props_test
+libsgprops_la_LDFLAGS = -release @VERSION@ -module
 
-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
-
-if HAVE_FRAMEWORK_OSG
-props_test_LDFLAGS = $(openthreads_FRAMEWORK)
-else
-props_test_LDFLAGS = -lOpenThreads
-endif
+libsgprops_la_LIBADD = \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/route/Makefile.am SimGear-2.0.0/simgear/route/Makefile.am
--- SimGear-2.0.0.orig/simgear/route/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/route/Makefile.am	2010-02-26 22:35:25.643240307 +0100
@@ -1,35 +1,43 @@
 includedir = @includedir@/route
 
-lib_LIBRARIES = libsgroute.a
+lib_LTLIBRARIES = libsgroute.la
 
 include_HEADERS = route.hxx waypoint.hxx
 
-libsgroute_a_SOURCES = \
+libsgroute_la_SOURCES = \
 	route.cxx \
 	waypoint.cxx
 
+libsgroute_la_LDFLAGS = -release @VERSION@ -module
+
+libsgroute_la_LIBADD = \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = waytest routetest
 
 waytest_SOURCES = waytest.cxx
 
-waytest_LDADD = \
-	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 \
+waytest_LDFLAGS = \
+	$(top_builddir)/simgear/route/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
 
 routetest_SOURCES = routetest.cxx
 
-routetest_LDADD = \
-	libsgroute.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \
-	$(base_LIBS)
+routetest_LDFLAGS = \
+	$(top_builddir)/simgear/route/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
diff -uNrp SimGear-2.0.0.orig/simgear/scene/bvh/Makefile.am SimGear-2.0.0/simgear/scene/bvh/Makefile.am
--- SimGear-2.0.0.orig/simgear/scene/bvh/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/scene/bvh/Makefile.am	2010-02-26 22:35:25.643240307 +0100
@@ -4,9 +4,13 @@ check_PROGRAMS  = bvhtest
 TESTS           = $(check_PROGRAMS)
 
 bvhtest_SOURCES = bvhtest.cxx
-bvhtest_LDADD = libsgbvh.a -lsgstructure -lsgmath $(base_LIBS)
+bvhtest_LDFLAGS = \
+	$(top_builddir)/simgear/scene/bvh/libsgbvh.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(base_LIBS)
 
-lib_LIBRARIES = libsgbvh.a
+lib_LTLIBRARIES = libsgbvh.la
 
 noinst_HEADERS =
 
@@ -30,7 +34,7 @@ include_HEADERS = \
 	BVHTransform.hxx \
 	BVHVisitor.hxx
 
-libsgbvh_a_SOURCES = \
+libsgbvh_la_SOURCES = \
 	BVHGroup.cxx \
 	BVHLineGeometry.cxx \
 	BVHLineSegmentVisitor.cxx \
@@ -44,4 +48,6 @@ libsgbvh_a_SOURCES = \
 	BVHSubTreeCollector.cxx \
 	BVHTransform.cxx
 
+libsgbvh_la_LDFLAGS = -release @VERSION@ -module
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/scene/material/Makefile.am SimGear-2.0.0/simgear/scene/material/Makefile.am
--- SimGear-2.0.0.orig/simgear/scene/material/Makefile.am	2010-02-17 17:04:42.000000000 +0100
+++ SimGear-2.0.0/simgear/scene/material/Makefile.am	2010-02-26 22:38:16.325244538 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/material
 
-lib_LIBRARIES = libsgmaterial.a
+lib_LTLIBRARIES = libsgmaterial.la
 
 noinst_HEADERS =
 
@@ -17,7 +17,7 @@ include_HEADERS = \
 	matlib.hxx \
 	matmodel.hxx
 
-libsgmaterial_a_SOURCES = \
+libsgmaterial_la_SOURCES = \
 	Effect.cxx \
 	EffectBuilder.cxx \
 	EffectCullVisitor.cxx \
@@ -32,4 +32,14 @@ libsgmaterial_a_SOURCES = \
 	matmodel.cxx \
 	Noise.cxx Noise.hxx
 
+libsgmaterial_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lGL
+
+libsgmaterial_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/scene/model/libsgmodel.la \
+	$(top_builddir)/simgear/scene/tgdb/libsgtgdb.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/scene/model/Makefile.am SimGear-2.0.0/simgear/scene/model/Makefile.am
--- SimGear-2.0.0.orig/simgear/scene/model/Makefile.am	2010-02-17 17:05:10.000000000 +0100
+++ SimGear-2.0.0/simgear/scene/model/Makefile.am	2010-02-26 22:38:47.142241926 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/model
 
-lib_LIBRARIES = libsgmodel.a
+lib_LTLIBRARIES = libsgmodel.la
 
 noinst_HEADERS =
 
@@ -25,7 +25,7 @@ include_HEADERS = \
 	SGTranslateTransform.hxx \
 	SGText.hxx
 
-libsgmodel_a_SOURCES = \
+libsgmodel_la_SOURCES = \
 	animation.cxx \
 	BoundingVolumeBuildVisitor.hxx \
 	particles.cxx \
@@ -47,4 +47,14 @@ libsgmodel_a_SOURCES = \
 	SGTranslateTransform.cxx \
 	SGText.cxx
 
+libsgmodel_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibsg -losgParticle -lGL
+
+libsgmodel_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/environment/libsgenvironment.la \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)
Binary files SimGear-2.0.0.orig/simgear/scene/model/.Makefile.am.rej.swp and SimGear-2.0.0/simgear/scene/model/.Makefile.am.rej.swp differ
diff -uNrp SimGear-2.0.0.orig/simgear/scene/sky/Makefile.am SimGear-2.0.0/simgear/scene/sky/Makefile.am
--- SimGear-2.0.0.orig/simgear/scene/sky/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/scene/sky/Makefile.am	2010-02-26 22:35:25.644240510 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/sky
 
-lib_LIBRARIES = libsgsky.a
+lib_LTLIBRARIES = libsgsky.la
 
 include_HEADERS = \
 	cloud.hxx \
@@ -15,7 +15,7 @@ include_HEADERS = \
 	newcloud.hxx \
 	CloudShaderGeometry.hxx
 
-libsgsky_a_SOURCES = \
+libsgsky_la_SOURCES = \
 	cloud.cxx \
 	dome.cxx \
 	moon.cxx \
@@ -28,4 +28,17 @@ libsgsky_a_SOURCES = \
 	newcloud.cxx \
 	CloudShaderGeometry.cxx
 
+libsgsky_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibul -lplibsg \
+	-lGL -lGLU
+
+libsgsky_la_LIBADD = \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/scene/util/libsgutil.la \
+	$(top_builddir)/simgear/scene/material/libsgmaterial.la \
+	$(top_builddir)/simgear/scene/model/libsgmodel.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/scene/tgdb/Makefile.am SimGear-2.0.0/simgear/scene/tgdb/Makefile.am
--- SimGear-2.0.0.orig/simgear/scene/tgdb/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/scene/tgdb/Makefile.am	2010-02-26 22:35:25.645240155 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/tgdb
 
-lib_LIBRARIES = libsgtgdb.a
+lib_LTLIBRARIES = libsgtgdb.la
 
 noinst_HEADERS =
 
@@ -24,7 +24,7 @@ include_HEADERS = \
 	TileCache.hxx \
 	TileEntry.hxx
 
-libsgtgdb_a_SOURCES = \
+libsgtgdb_la_SOURCES = \
 	apt_signs.cxx \
 	obj.cxx \
 	pt_lights.cxx \
@@ -40,4 +40,13 @@ libsgtgdb_a_SOURCES = \
 	TileEntry.cxx \
 	TreeBin.cxx TreeBin.hxx
 
+libsgtgdb_la_LDFLAGS = -release @VERSION@ -module -lplibssg -lplibul -lGL
+
+libsgtgdb_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/math/libsgmath.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/scene/util/Makefile.am SimGear-2.0.0/simgear/scene/util/Makefile.am
--- SimGear-2.0.0.orig/simgear/scene/util/Makefile.am	2010-02-17 16:39:21.000000000 +0100
+++ SimGear-2.0.0/simgear/scene/util/Makefile.am	2010-02-26 22:35:25.645240155 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene/util
 
-lib_LIBRARIES = libsgutil.a
+lib_LTLIBRARIES = libsgutil.la
 
 noinst_HEADERS =
 
@@ -25,7 +25,7 @@ include_HEADERS = \
 	VectorArrayAdapter.hxx
 
 
-libsgutil_a_SOURCES = \
+libsgutil_la_SOURCES = \
 	SGEnlargeBoundingBox.cxx \
 	SGSceneFeatures.cxx \
 	SGSceneUserData.cxx \
@@ -39,4 +39,9 @@ libsgutil_a_SOURCES = \
 	QuadTreeBuilder.cxx \
 	UpdateOnceCallback.cxx
 
+libsgutil_la_LDFLAGS = -release @VERSION@ -module
+
+libsgutil_la_LIBADD = \
+	$(top_builddir)/simgear/scene/material/libsgmaterial.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/screen/Makefile.am SimGear-2.0.0/simgear/screen/Makefile.am
--- SimGear-2.0.0.orig/simgear/screen/Makefile.am	2010-02-17 16:39:22.000000000 +0100
+++ SimGear-2.0.0/simgear/screen/Makefile.am	2010-02-26 22:35:25.645240155 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/screen
 
-lib_LIBRARIES = libsgscreen.a
+lib_LTLIBRARIES = libsgscreen.la
 
 EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx
 
@@ -23,7 +23,7 @@ include_HEADERS = \
 	shader.h \
 	tr.h
 
-libsgscreen_a_SOURCES = \
+libsgscreen_la_SOURCES = \
 	GLBitmaps.cxx \
 	$(IMAGE_SERVER_SRCS) \
 	screen-dump.cxx \
@@ -33,15 +33,21 @@ libsgscreen_a_SOURCES = \
 	shader.cpp \
 	win32-printer.h
 
+libsgscreen_la_LDFLAGS = -release @VERSION@ -module -lGL -lGLU -lX11 -lz \
+	-ldl -ljpeg -lplibssg -losgDB -lOpenThreads -losg
+
+libsgscreen_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 if HAVE_GLUT
 noinst_PROGRAMS = TestRenderTexture
 
 TestRenderTexture_SOURCES = TestRenderTexture.cpp
 
-TestRenderTexture_LDADD = \
-	libsgscreen.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(opengl_LIBS)
+TestRenderTexture_LDFLAGS = \
+	$(top_builddir)/simgear/screen/libsgscreen.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(opengl_LIBS) -lz -lplibssg -ljpeg
 endif
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGLX_GLXEXT_PROTOTYPES
diff -uNrp SimGear-2.0.0.orig/simgear/serial/Makefile.am SimGear-2.0.0/simgear/serial/Makefile.am
--- SimGear-2.0.0.orig/simgear/serial/Makefile.am	2010-02-17 16:39:22.000000000 +0100
+++ SimGear-2.0.0/simgear/serial/Makefile.am	2010-02-26 22:35:25.645240155 +0100
@@ -1,17 +1,21 @@
 includedir = @includedir@/serial
 
-lib_LIBRARIES = libsgserial.a
+lib_LTLIBRARIES = libsgserial.la
 
 include_HEADERS = serial.hxx
 
-libsgserial_a_SOURCES = serial.cxx
+libsgserial_la_SOURCES = serial.cxx
+
+libsgserial_la_LDFLAGS = -release @VERSION@ -module
+libsgserial_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la
 
 noinst_PROGRAMS = testserial
 
 testserial_SOURCES = testserial.cxx
 
-testserial_LDADD = \
-	libsgserial.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a
+testserial_LDFLAGS = \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
 
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/sound/Makefile.am SimGear-2.0.0/simgear/sound/Makefile.am
--- SimGear-2.0.0.orig/simgear/sound/Makefile.am	2010-02-17 16:39:22.000000000 +0100
+++ SimGear-2.0.0/simgear/sound/Makefile.am	2010-02-26 22:35:25.646240497 +0100
@@ -2,7 +2,7 @@ includedir = @includedir@/sound
 
 EXTRA_DIST = jet.wav
 
-lib_LIBRARIES = libsgsound.a
+lib_LTLIBRARIES = libsgsound.la
 
 noinst_HEADERS =
 
@@ -12,38 +12,44 @@ include_HEADERS = \
 	soundmgr_openal.hxx \
 	xmlsound.hxx 
 
-libsgsound_a_SOURCES = \
+libsgsound_la_SOURCES = \
 	sample_group.cxx \
 	sample_openal.cxx  \
 	soundmgr_openal.cxx \
 	xmlsound.cxx 
 
+libsgsound_la_LDFLAGS = -release @VERSION@ -module $(openal_LIBS)
+libsgsound_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/props/libsgprops.la
+
 check_PROGRAMS = openal_test1 openal_test2 openal_test3
 
 openal_test1_SOURCES = openal_test1.cxx
 openal_test2_SOURCES = openal_test2.cxx
 openal_test3_SOURCES = openal_test3.cxx
 
-openal_test1_LDADD = \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
+openal_test1_LDFLAGS = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(openal_LIBS)
 
-openal_test2_LDADD = \
-	libsgsound.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \
-	$(top_builddir)/simgear/timing/libsgtiming.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
+openal_test2_LDFLAGS = \
+	$(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)
 
-openal_test3_LDADD = \
-	libsgsound.a \
-	$(top_builddir)/simgear/structure/libsgstructure.a \
-	$(top_builddir)/simgear/timing/libsgtiming.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
+openal_test3_LDFLAGS = \
+	$(top_builddir)/simgear/sound/libsgsound.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/timing/libsgtiming.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
 	$(openal_LIBS) -lstdc++
 
 INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"
diff -uNrp SimGear-2.0.0.orig/simgear/structure/Makefile.am SimGear-2.0.0/simgear/structure/Makefile.am
--- SimGear-2.0.0.orig/simgear/structure/Makefile.am	2010-02-17 16:39:22.000000000 +0100
+++ SimGear-2.0.0/simgear/structure/Makefile.am	2010-02-26 22:35:25.646240497 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/structure
 
-lib_LIBRARIES = libsgstructure.a
+lib_LTLIBRARIES = libsgstructure.la
 
 include_HEADERS = \
 	callback.hxx \
@@ -23,7 +23,7 @@ include_HEADERS = \
 	Singleton.hxx \
 	StringTable.hxx
 
-libsgstructure_a_SOURCES = \
+libsgstructure_la_SOURCES = \
 	commands.cxx \
 	exception.cxx \
 	event_mgr.cxx\
@@ -36,5 +36,10 @@ libsgstructure_a_SOURCES = \
 	SGSmplstat.cxx \
 	StringTable.cxx
 
+libsgstructure_la_LDFLAGS = -release @VERSION@ -module
+
+libsgstructure_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la
+
 INCLUDES = -I$(top_srcdir)
 
diff -uNrp SimGear-2.0.0.orig/simgear/threads/Makefile.am SimGear-2.0.0/simgear/threads/Makefile.am
--- SimGear-2.0.0.orig/simgear/threads/Makefile.am	2010-02-17 16:39:22.000000000 +0100
+++ SimGear-2.0.0/simgear/threads/Makefile.am	2010-02-26 22:35:25.646240497 +0100
@@ -1,16 +1,18 @@
 includedir = @includedir@/threads
 
 if HAVE_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
 
+libsgthreads_la_LDFLAGS = -release @VERSION@ -module
+
 INCLUDES = -I$(top_srcdir)
 else
 include_HEADERS = SGQueue.hxx
diff -uNrp SimGear-2.0.0.orig/simgear/timing/Makefile.am SimGear-2.0.0/simgear/timing/Makefile.am
--- SimGear-2.0.0.orig/simgear/timing/Makefile.am	2010-02-17 16:39:22.000000000 +0100
+++ SimGear-2.0.0/simgear/timing/Makefile.am	2010-02-26 22:35:25.646240497 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/timing
 
-lib_LIBRARIES = libsgtiming.a
+lib_LTLIBRARIES = libsgtiming.la
 
 include_HEADERS = \
 	geocoord.h \
@@ -9,11 +9,17 @@ include_HEADERS = \
 	timestamp.hxx \
 	timezone.h
 
-libsgtiming_a_SOURCES = \
+libsgtiming_la_SOURCES = \
 	geocoord.cxx \
 	lowleveltime.cxx \
 	sg_time.cxx \
 	timestamp.cxx \
 	timezone.cxx
 
+libsgtiming_la_LDFLAGS = -release @VERSION@ -module
+
+libsgtiming_la_LIBADD = \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la
+
 INCLUDES = -I$(top_srcdir)
diff -uNrp SimGear-2.0.0.orig/simgear/xml/Makefile.am SimGear-2.0.0/simgear/xml/Makefile.am
--- SimGear-2.0.0.orig/simgear/xml/Makefile.am	2010-02-17 16:39:22.000000000 +0100
+++ SimGear-2.0.0/simgear/xml/Makefile.am	2010-02-26 22:35:25.647240211 +0100
@@ -1,6 +1,6 @@
 includedir = @includedir@/xml
 
-lib_LIBRARIES = libsgxml.a
+lib_LTLIBRARIES = libsgxml.la
 
 include_HEADERS = \
 	easyxml.hxx
@@ -8,7 +8,7 @@ include_HEADERS = \
 noinst_HEADERS = \
 	xmltok_impl.c xmltok_ns.c
 
-libsgxml_a_SOURCES = \
+libsgxml_la_SOURCES = \
 	asciitab.h \
 	easyxml.cxx \
 	hashtable.h hashtable.c \
@@ -18,4 +18,9 @@ libsgxml_a_SOURCES = \
 	xmltok.h xmltok.c \
 	xmltok_impl.h
 
+libsgxml_la_LDFLAGS = -release @VERSION@ -module
+
+libsgxml_la_LIBADD = \
+	$(top_builddir)/simgear/structure/libsgstructure.la
+
 INCLUDES = -I$(top_srcdir)