Author: jareq Date: Tue Aug 11 17:01:54 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.9.1
---- Files affected:
packages/SimGear:
SimGear-link.patch (1.1 -> 1.2) , SimGear-shared.patch (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/SimGear/SimGear-link.patch
diff -u packages/SimGear/SimGear-link.patch:1.1
packages/SimGear/SimGear-link.patch:1.2
--- packages/SimGear/SimGear-link.patch:1.1 Mon May 28 00:07:32 2007
+++ packages/SimGear/SimGear-link.patch Tue Aug 11 19:01:49 2009
@@ -1,7 +1,26 @@
---- 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 = \
@@ -9,21 +28,145 @@
+ $(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
@@ -34,19 +177,23 @@
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
@@ -61,35 +208,16 @@
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
================================================================
Index: packages/SimGear/SimGear-shared.patch
diff -u packages/SimGear/SimGear-shared.patch:1.11
packages/SimGear/SimGear-shared.patch:1.12
--- packages/SimGear/SimGear-shared.patch:1.11 Thu Aug 17 09:22:40 2006
+++ packages/SimGear/SimGear-shared.patch Tue Aug 11 19:01:49 2009
@@ -1,43 +1,85 @@
---- 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
@@ -55,151 +97,164 @@
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)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SimGear/SimGear-link.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SimGear/SimGear-shared.patch?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
