3beca6e97bd45b0be5a00b7cd945b8fd SimGear-0.2.0.tar.gz

Changed files:
    SimGear-shared.patch -> 1.3

diff --git a/SimGear-shared.patch b/SimGear-shared.patch
index 5011ec2d19bf6024edbaaa69cff9d017fb67d083..854f30f9cb27ea501ab3d25b6d082385a9bef705 100644 (file)
--- a/SimGear-shared.patch
+++ b/SimGear-shared.patch
@@ -1,6 +1,7 @@
---- configure.in~      Sun Apr 21 00:03:48 2002
-+++ configure.in       Thu May  9 00:36:15 2002
-@@ -33,7 +33,7 @@
+diff -Naur SimGear-0.2.0/configure.ac SimGear-0.2.0-p/configure.ac
+--- SimGear-0.2.0/configure.ac Sat Sep  7 03:25:02 2002
++++ SimGear-0.2.0-p/configure.ac       Fri Sep 13 08:12:18 2002
+@@ -34,7 +34,7 @@
  AC_PROG_CC
  AC_PROG_CPP
  AC_PROG_CXX
@@ -9,8 +10,27 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
  
---- simgear/bucket/Makefile.am~        Thu May  9 00:35:01 2002
-+++ simgear/bucket/Makefile.am Thu May  9 00:39:33 2002
+diff -Naur SimGear-0.2.0/simgear/Makefile.am SimGear-0.2.0-p/simgear/Makefile.am
+--- SimGear-0.2.0/simgear/Makefile.am  Mon Sep  2 05:42:51 2002
++++ SimGear-0.2.0-p/simgear/Makefile.am        Fri Sep 13 08:21:08 2002
+@@ -18,13 +18,13 @@
+       misc \
+       bucket \
+       ephemeris \
++      serial \
+       io \
+       magvar \
+       math \
+       $(METAR_DIRS) \
+       route \
+       screen \
+-      serial \
+       sky \
+       $(SGTHREAD_DIR) \
+       timing \
+diff -Naur SimGear-0.2.0/simgear/bucket/Makefile.am SimGear-0.2.0-p/simgear/bucket/Makefile.am
+--- SimGear-0.2.0/simgear/bucket/Makefile.am   Sun Aug 25 19:24:15 2002
++++ SimGear-0.2.0-p/simgear/bucket/Makefile.am Fri Sep 13 08:13:01 2002
 @@ -1,10 +1,10 @@
  includedir = @includedir@/bucket
  
@@ -24,9 +44,10 @@
  
  # noinst_PROGRAMS = testbucket
  
---- simgear/debug/Makefile.am~ Thu May  9 00:35:01 2002
-+++ simgear/debug/Makefile.am  Thu May  9 00:40:16 2002
-@@ -2,11 +2,11 @@
+diff -Naur SimGear-0.2.0/simgear/debug/Makefile.am SimGear-0.2.0-p/simgear/debug/Makefile.am
+--- SimGear-0.2.0/simgear/debug/Makefile.am    Sun Aug 25 19:24:20 2002
++++ SimGear-0.2.0-p/simgear/debug/Makefile.am  Fri Sep 13 08:13:24 2002
+@@ -2,10 +2,10 @@
  
  EXTRA_DIST = logtest.cxx
  
@@ -39,9 +60,9 @@
 +libsgdebug_la_SOURCES = logstream.cxx
  
  INCLUDES = -I$(top_srcdir)
- 
---- simgear/ephemeris/Makefile.am~     Thu May  9 00:35:01 2002
-+++ simgear/ephemeris/Makefile.am      Thu May  9 00:41:24 2002
+diff -Naur SimGear-0.2.0/simgear/ephemeris/Makefile.am SimGear-0.2.0-p/simgear/ephemeris/Makefile.am
+--- SimGear-0.2.0/simgear/ephemeris/Makefile.am        Sun Aug 25 19:24:27 2002
++++ SimGear-0.2.0-p/simgear/ephemeris/Makefile.am      Fri Sep 13 08:13:39 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/ephemeris
  
@@ -59,8 +80,9 @@
        celestialBody.cxx \
        ephemeris.cxx \
        jupiter.cxx \
---- simgear/io/Makefile.am~    Thu May  9 00:35:01 2002
-+++ simgear/io/Makefile.am     Thu May  9 00:44:11 2002
+diff -Naur SimGear-0.2.0/simgear/io/Makefile.am SimGear-0.2.0-p/simgear/io/Makefile.am
+--- SimGear-0.2.0/simgear/io/Makefile.am       Sat Sep  7 01:13:31 2002
++++ SimGear-0.2.0-p/simgear/io/Makefile.am     Fri Sep 13 08:15:47 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/io
  
@@ -78,7 +100,7 @@
        iochannel.cxx \
        lowlevel.cxx \
        sg_binobj.cxx \
-@@ -33,24 +33,32 @@
+@@ -53,24 +53,32 @@
  socktest_SOURCES = socktest.cxx
  
  socktest_LDADD = \
@@ -87,26 +109,25 @@
 -      $(top_builddir)/simgear/debug/libsgdebug.a \
 -      $(top_builddir)/simgear/misc/libsgmisc.a \
 -      $(top_builddir)/simgear/xml/libsgxml.a \
--      -lz
 +      $(top_builddir)/simgear/bucket/libsgbucket.la \
 +        $(top_builddir)/simgear/io/libsgio.la \
 +      $(top_builddir)/simgear/debug/libsgdebug.la \
-+      $(top_builddir)/simgear/serial/libsgserial.la \
 +      $(top_builddir)/simgear/misc/libsgmisc.la \
 +      $(top_builddir)/simgear/xml/libsgxml.la \
-+      -lz -lplibnet
++      $(top_builddir)/simgear/serial/libsgserial.la \
+       -lplibnet -lplibul -lz $(NETWORK_LIB)
  
  lowtest_SOURCES = lowtest.cxx
  
  lowtest_LDADD = \
 -      $(top_builddir)/simgear/io/libsgio.a
 +      $(top_builddir)/simgear/io/libsgio.la \
-+       $(top_builddir)/simgear/bucket/libsgbucket.la \
++      $(top_builddir)/simgear/bucket/libsgbucket.la \
 +      $(top_builddir)/simgear/serial/libsgserial.la \
 +      $(top_builddir)/simgear/debug/libsgdebug.la \
-+        $(top_builddir)/simgear/misc/libsgmisc.la \
-+       $(top_builddir)/simgear/xml/libsgxml.la \
-+      -lz -lplibnet
++      $(top_builddir)/simgear/misc/libsgmisc.la \
++      $(top_builddir)/simgear/xml/libsgxml.la \
++      -lplibnet -lplibul -lz $(NETWORK_LIB)
  
  decode_binobj_SOURCES = decode_binobj.cxx
  
@@ -116,16 +137,17 @@
 -        $(top_builddir)/simgear/misc/libsgmisc.a \
 -        $(top_builddir)/simgear/debug/libsgdebug.a \
 -      $(top_builddir)/simgear/xml/libsgxml.a \
--      $(NETWORK_LIB) -lz
+-      -lz
 +      $(top_builddir)/simgear/io/libsgio.la \
-+      $(top_builddir)/simgear/serial/libsgserial.la \
 +        $(top_builddir)/simgear/bucket/libsgbucket.la \
 +        $(top_builddir)/simgear/misc/libsgmisc.la \
 +        $(top_builddir)/simgear/debug/libsgdebug.la \
 +      $(top_builddir)/simgear/xml/libsgxml.la \
-+      $(NETWORK_LIB) -lz -lplibnet
---- simgear/magvar/Makefile.am~        Thu May  9 00:35:01 2002
-+++ simgear/magvar/Makefile.am Thu May  9 00:45:27 2002
++      $(top_builddir)/simgear/serial/libsgserial.la \
++      $(NETWORK_LIB) -lz -lplibnet
+diff -Naur SimGear-0.2.0/simgear/magvar/Makefile.am SimGear-0.2.0-p/simgear/magvar/Makefile.am
+--- SimGear-0.2.0/simgear/magvar/Makefile.am   Sun Aug 25 19:24:53 2002
++++ SimGear-0.2.0-p/simgear/magvar/Makefile.am Fri Sep 13 08:16:10 2002
 @@ -1,10 +1,10 @@
  includedir = @includedir@/magvar
  
@@ -139,7 +161,7 @@
        coremag.hxx coremag.cxx \
        magvar.cxx
  
-@@ -12,7 +12,7 @@
+@@ -12,6 +12,6 @@
  
  testmagvar_SOURCES = testmagvar.cxx
  
@@ -147,9 +169,9 @@
 +testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.la
  
  INCLUDES = -I$(top_srcdir)
- 
---- simgear/math/Makefile.am~  Thu May  9 00:35:01 2002
-+++ simgear/math/Makefile.am   Thu May  9 00:46:28 2002
+diff -Naur SimGear-0.2.0/simgear/math/Makefile.am SimGear-0.2.0-p/simgear/math/Makefile.am
+--- SimGear-0.2.0/simgear/math/Makefile.am     Sun Aug 25 19:25:01 2002
++++ SimGear-0.2.0-p/simgear/math/Makefile.am   Fri Sep 13 08:16:39 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/math
  
@@ -167,8 +189,9 @@
        interpolater.cxx \
        leastsqs.cxx \
        polar3d.cxx \
---- simgear/metar/Makefile.am~ Thu May  9 00:35:01 2002
-+++ simgear/metar/Makefile.am  Thu May  9 00:47:28 2002
+diff -Naur SimGear-0.2.0/simgear/metar/Makefile.am SimGear-0.2.0-p/simgear/metar/Makefile.am
+--- SimGear-0.2.0/simgear/metar/Makefile.am    Sun Aug 25 19:25:07 2002
++++ SimGear-0.2.0-p/simgear/metar/Makefile.am  Fri Sep 13 08:16:56 2002
 @@ -1,10 +1,10 @@
  includedir = @includedir@/metar
  
@@ -182,8 +205,9 @@
        Antoi.cpp Charcmp.cpp Dcdmetar.cpp Dcdmtrmk.cpp Drvmetar.c \
        Fracpart.cpp Local.h Metar.h \
        MetarReport.cpp \
---- simgear/misc/Makefile.am~  Thu May  9 00:35:01 2002
-+++ simgear/misc/Makefile.am   Thu May  9 00:49:22 2002
+diff -Naur SimGear-0.2.0/simgear/misc/Makefile.am SimGear-0.2.0-p/simgear/misc/Makefile.am
+--- SimGear-0.2.0/simgear/misc/Makefile.am     Sun Aug 25 19:25:13 2002
++++ SimGear-0.2.0-p/simgear/misc/Makefile.am   Fri Sep 13 08:17:36 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/misc
  
@@ -201,7 +225,7 @@
          commands.cxx \
          exception.cxx \
        props.cxx \
-@@ -28,7 +28,7 @@
+@@ -28,6 +28,6 @@
  noinst_PROGRAMS = props_test
  
  props_test_SOURCES = props_test.cxx
@@ -209,9 +233,9 @@
 +props_test_LDADD = libsgmisc.la ../xml/libsgxml.la ../debug/libsgdebug.la -lz
  
  INCLUDES = -I$(top_srcdir)
- 
---- simgear/route/Makefile.am~ Thu May  9 00:35:01 2002
-+++ simgear/route/Makefile.am  Thu May  9 00:51:04 2002
+diff -Naur SimGear-0.2.0/simgear/route/Makefile.am SimGear-0.2.0-p/simgear/route/Makefile.am
+--- SimGear-0.2.0/simgear/route/Makefile.am    Sun Aug 25 19:25:18 2002
++++ SimGear-0.2.0-p/simgear/route/Makefile.am  Fri Sep 13 08:18:32 2002
 @@ -1,10 +1,10 @@
  includedir = @includedir@/route
  
@@ -249,12 +273,13 @@
 -      $(top_builddir)/simgear/debug/libsgdebug.a
 +      $(top_builddir)/simgear/route/libsgroute.la \
 +      $(top_builddir)/simgear/math/libsgmath.la \
-+       $(top_builddir)/simgear/misc/libsgmisc.la \
-+       $(top_builddir)/simgear/debug/libsgdebug.la \
-+       $(top_builddir)/simgear/xml/libsgxml.la \
++      $(top_builddir)/simgear/debug/libsgdebug.la \
++      $(top_builddir)/simgear/misc/libsgmisc.la \
++      $(top_builddir)/simgear/xml/libsgxml.la \
 +      -lz
---- simgear/screen/Makefile.am~        Thu May  9 00:35:01 2002
-+++ simgear/screen/Makefile.am Thu May  9 00:51:54 2002
+diff -Naur SimGear-0.2.0/simgear/screen/Makefile.am SimGear-0.2.0-p/simgear/screen/Makefile.am
+--- SimGear-0.2.0/simgear/screen/Makefile.am   Sun Aug 25 19:25:25 2002
++++ SimGear-0.2.0-p/simgear/screen/Makefile.am Fri Sep 13 08:18:51 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/screen
  
@@ -272,11 +297,11 @@
        GLBitmaps.cxx GLBitmaps.h \
        $(IMAGE_SERVER_SRCS) \
        screen-dump.cxx \
---- simgear/serial/Makefile.am~        Thu May  9 00:35:01 2002
-+++ simgear/serial/Makefile.am Thu May  9 00:52:55 2002
-@@ -2,17 +2,17 @@
- 
- noinst_PROGRAMS = testserial
+diff -Naur SimGear-0.2.0/simgear/serial/Makefile.am SimGear-0.2.0-p/simgear/serial/Makefile.am
+--- SimGear-0.2.0/simgear/serial/Makefile.am   Sat Sep  7 02:40:38 2002
++++ SimGear-0.2.0-p/simgear/serial/Makefile.am Fri Sep 13 08:19:16 2002
+@@ -1,17 +1,17 @@
+ includedir = @includedir@/serial
  
 -lib_LIBRARIES = libsgserial.a
 +lib_LTLIBRARIES = libsgserial.la
@@ -286,6 +311,8 @@
 -libsgserial_a_SOURCES = serial.cxx
 +libsgserial_la_SOURCES = serial.cxx
  
+ noinst_PROGRAMS = testserial
+ 
  testserial_SOURCES = testserial.cxx
  
  testserial_LDADD = \
@@ -295,9 +322,9 @@
 +      $(top_builddir)/simgear/debug/libsgdebug.la
  
  INCLUDES = -I$(top_srcdir)
- 
---- simgear/sky/Makefile.am~   Thu May  9 00:35:01 2002
-+++ simgear/sky/Makefile.am    Thu May  9 00:54:55 2002
+diff -Naur SimGear-0.2.0/simgear/sky/Makefile.am SimGear-0.2.0-p/simgear/sky/Makefile.am
+--- SimGear-0.2.0/simgear/sky/Makefile.am      Sun Aug 25 19:25:35 2002
++++ SimGear-0.2.0-p/simgear/sky/Makefile.am    Fri Sep 13 08:19:31 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/sky
  
@@ -315,8 +342,28 @@
        cloud.cxx \
        dome.cxx \
        moon.cxx \
---- simgear/timing/Makefile.am~        Thu May  9 00:35:01 2002
-+++ simgear/timing/Makefile.am Thu May  9 00:55:32 2002
+diff -Naur SimGear-0.2.0/simgear/threads/Makefile.am SimGear-0.2.0-p/simgear/threads/Makefile.am
+--- SimGear-0.2.0/simgear/threads/Makefile.am  Sun Aug 25 19:25:39 2002
++++ SimGear-0.2.0-p/simgear/threads/Makefile.am        Fri Sep 13 08:20:32 2002
+@@ -1,13 +1,13 @@
+ includedir = @includedir@/threads
+ 
+-lib_LIBRARIES = libsgthreads.a
++lib_LTLIBRARIES = libsgthreads.la
+ 
+ include_HEADERS = \
+       SGGuard.hxx \
+       SGQueue.hxx \
+       SGThread.hxx
+ 
+-libsgthreads_a_SOURCES = \
++libsgthreads_la_SOURCES = \
+       SGThread.cxx
+ 
+ INCLUDES = -I$(top_srcdir)
+diff -Naur SimGear-0.2.0/simgear/timing/Makefile.am SimGear-0.2.0-p/simgear/timing/Makefile.am
+--- SimGear-0.2.0/simgear/timing/Makefile.am   Sun Aug 25 19:25:43 2002
++++ SimGear-0.2.0-p/simgear/timing/Makefile.am Fri Sep 13 08:19:41 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/timing
  
@@ -334,9 +381,10 @@
        geocoord.cxx \
        lowleveltime.cxx \
        sg_time.cxx \
---- simgear/xgl/Makefile.am~   Thu May  9 00:35:01 2002
-+++ simgear/xgl/Makefile.am    Thu May  9 00:56:07 2002
-@@ -1,10 +1,10 @@
+diff -Naur SimGear-0.2.0/simgear/xgl/Makefile.am SimGear-0.2.0-p/simgear/xgl/Makefile.am
+--- SimGear-0.2.0/simgear/xgl/Makefile.am      Sun Aug 25 19:25:47 2002
++++ SimGear-0.2.0-p/simgear/xgl/Makefile.am    Fri Sep 13 08:20:05 2002
+@@ -1,9 +1,9 @@
  includedir = @includedir@/xgl
  
 -lib_LIBRARIES = libsgxgl.a
@@ -348,9 +396,9 @@
 +libsgxgl_la_SOURCES = xgl.c xglUtils.c
  
  INCLUDES = -I$(top_srcdir)
- 
---- simgear/xml/Makefile.am~   Thu May  9 00:35:01 2002
-+++ simgear/xml/Makefile.am    Thu May  9 00:56:39 2002
+diff -Naur SimGear-0.2.0/simgear/xml/Makefile.am SimGear-0.2.0-p/simgear/xml/Makefile.am
+--- SimGear-0.2.0/simgear/xml/Makefile.am      Sun Aug 25 19:25:52 2002
++++ SimGear-0.2.0-p/simgear/xml/Makefile.am    Fri Sep 13 08:20:15 2002
 @@ -1,6 +1,6 @@
  includedir = @includedir@/xml
  
@@ -368,39 +416,40 @@
          asciitab.h \
        easyxml.cxx \
        hashtable.h hashtable.c \
---- simgear/threads/Makefile.am~       Thu May  9 00:35:01 2002
-+++ simgear/threads/Makefile.am        Thu May  9 00:57:41 2002
-@@ -1,13 +1,13 @@
- includedir = @includedir@/threads
+diff -Naur SimGear-0.2.0/simgear/io/Makefile.am SimGear-0.2.0-p/simgear/io/Makefile.am
+--- SimGear-0.2.0/simgear/io/Makefile.am       Fri Sep 13 20:44:42 2002
++++ SimGear-0.2.0-p/simgear/io/Makefile.am     Fri Sep 13 20:45:21 2002
+@@ -33,21 +33,23 @@
+ tcp_server_SOURCES = tcp_server.cxx
  
--lib_LIBRARIES = libsgthreads.a
-+lib_LTLIBRARIES = libsgthreads.la
+ tcp_server_LDADD = \
+-      $(top_builddir)/simgear/io/libsgio.a \
+-      $(top_builddir)/simgear/debug/libsgdebug.a \
+-      $(top_builddir)/simgear/bucket/libsgbucket.a \
+-      $(top_builddir)/simgear/misc/libsgmisc.a \
+-      $(top_builddir)/simgear/xml/libsgxml.a \
++      $(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/xml/libsgxml.la \
++      $(top_builddir)/simgear/serial/libsgserial.la \
+       -lplibnet -lplibul -lz $(NETWORK_LIB)
  
- include_HEADERS = \
-       SGGuard.hxx \
-       SGQueue.hxx \
-       SGThread.hxx
+ tcp_client_SOURCES = tcp_client.cxx
  
--libsgthreads_a_SOURCES = \
-+libsgthreads_la_SOURCES = \
-       SGThread.cxx
+ tcp_client_LDADD = \
+-      $(top_builddir)/simgear/io/libsgio.a \
+-      $(top_builddir)/simgear/debug/libsgdebug.a \
+-      $(top_builddir)/simgear/bucket/libsgbucket.a \
+-      $(top_builddir)/simgear/misc/libsgmisc.a \
+-        $(top_builddir)/simgear/xml/libsgxml.a \
++      $(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/xml/libsgxml.la \
++        $(top_builddir)/simgear/serial/libsgserial.la \
+       -lplibnet -lplibul -lz $(NETWORK_LIB)
  
- INCLUDES = -I$(top_srcdir)
-
---- simgear/Makefile.am~       Sat Dec 29 01:37:03 2001
-+++ simgear/Makefile.am        Thu May  9 02:36:08 2002
-@@ -24,13 +24,13 @@
-       misc \
-       bucket \
-       ephemeris \
-+      $(SERIAL_DIRS) \
-       io \
-       magvar \
-       math \
-       $(METAR_DIRS) \
-       route \
-       screen \
--      $(SERIAL_DIRS) \
-       sky \
-       $(SGTHREAD_DIR) \
-       timing \
+ socktest_SOURCES = socktest.cxx