SOURCES: SimGear-shared.patch, SimGear-libs.patch (REMOVED) - Vers...
matkor
matkor at pld-linux.org
Thu Aug 17 09:22:45 CEST 2006
Author: matkor Date: Thu Aug 17 07:22:45 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- Version 0.3.10-1
- Added TODO about setting sonames
- Merged libs.patch and necessary changes to single shared.patch
---- Files affected:
SOURCES:
SimGear-shared.patch (1.10 -> 1.11) , SimGear-libs.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: SOURCES/SimGear-shared.patch
diff -u SOURCES/SimGear-shared.patch:1.10 SOURCES/SimGear-shared.patch:1.11
--- SOURCES/SimGear-shared.patch:1.10 Wed Dec 7 23:59:03 2005
+++ SOURCES/SimGear-shared.patch Thu Aug 17 09:22:40 2006
@@ -1,50 +1,5 @@
-diff -Naur SimGear-0.3.5/configure.ac SimGear-0.3.5-p/configure.ac
---- SimGear-0.3.5/configure.ac Fri Mar 26 22:07:15 2004
-+++ SimGear-0.3.5-p/configure.ac Mon Mar 29 11:47:51 2004
-@@ -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
-
-diff -Naur SimGear-0.3.5/simgear/bucket/Makefile.am SimGear-0.3.5-p/simgear/bucket/Makefile.am
---- SimGear-0.3.5/simgear/bucket/Makefile.am Sat Sep 7 04:58:19 2002
-+++ SimGear-0.3.5-p/simgear/bucket/Makefile.am Mon Mar 29 11:47:51 2004
-@@ -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 -Naur SimGear-0.3.5/simgear/debug/Makefile.am SimGear-0.3.5-p/simgear/debug/Makefile.am
---- SimGear-0.3.5/simgear/debug/Makefile.am Sat Sep 7 04:58:19 2002
-+++ SimGear-0.3.5-p/simgear/debug/Makefile.am Mon Mar 29 11:47:51 2004
-@@ -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 -Naur SimGear-0.3.5/simgear/environment/Makefile.am SimGear-0.3.5-p/simgear/environment/Makefile.am
---- SimGear-0.3.5/simgear/environment/Makefile.am Mon Feb 2 11:12:31 2004
-+++ SimGear-0.3.5-p/simgear/environment/Makefile.am Mon Mar 29 11:54:27 2004
+--- 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
@@ -1,9 +1,9 @@
includedir = @includedir@/environment
@@ -57,29 +12,32 @@
+libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx
INCLUDES = -I$(top_srcdir)
-diff -Naur SimGear-0.3.5/simgear/ephemeris/Makefile.am SimGear-0.3.5-p/simgear/ephemeris/Makefile.am
---- SimGear-0.3.5/simgear/ephemeris/Makefile.am Fri Aug 29 19:36:27 2003
-+++ SimGear-0.3.5-p/simgear/ephemeris/Makefile.am Mon Mar 29 11:47:51 2004
-@@ -1,6 +1,6 @@
- includedir = @includedir@/ephemeris
+--- 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 = libsgephem.a
-+lib_LTLIBRARIES = libsgephem.la
+-lib_LIBRARIES = libsgmagvar.a
++lib_LTLIBRARIES = libsgmagvar.la
- include_HEADERS = \
- celestialBody.hxx \
-@@ -16,7 +16,7 @@
- uranus.hxx \
- venus.hxx
+ include_HEADERS = magvar.hxx
--libsgephem_a_SOURCES = \
-+libsgephem_la_SOURCES = \
- celestialBody.cxx \
- ephemeris.cxx \
- jupiter.cxx \
-diff -Naur SimGear-0.3.5/simgear/io/Makefile.am SimGear-0.3.5-p/simgear/io/Makefile.am
---- SimGear-0.3.5/simgear/io/Makefile.am Mon Dec 29 16:56:17 2003
-+++ SimGear-0.3.5-p/simgear/io/Makefile.am Mon Mar 29 11:49:03 2004
+-libsgmagvar_a_SOURCES = \
++libsgmagvar_la_SOURCES = \
+ coremag.hxx coremag.cxx \
+ magvar.cxx
+
+@@ -13,7 +13,7 @@
+ testmagvar_SOURCES = testmagvar.cxx
+
+ testmagvar_LDADD = \
+- $(top_builddir)/simgear/magvar/libsgmagvar.a \
++ $(top_builddir)/simgear/magvar/libsgmagvar.la \
+ $(base_LIBS)
+
+ 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
@@ -1,6 +1,6 @@
includedir = @includedir@/io
@@ -97,7 +55,7 @@
iochannel.cxx \
lowlevel.cxx \
sg_binobj.cxx \
-@@ -27,10 +27,11 @@
+@@ -27,10 +27,14 @@
tcp_server_SOURCES = tcp_server.cxx
tcp_server_LDADD = \
@@ -110,10 +68,13 @@
+ $(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 +39,11 @@
+@@ -38,10 +42,14 @@
tcp_client_SOURCES = tcp_client.cxx
tcp_client_LDADD = \
@@ -125,11 +86,14 @@
+ $(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 +51,10 @@
+@@ -49,10 +57,15 @@
socktest_SOURCES = socktest.cxx
socktest_LDADD = \
@@ -141,10 +105,15 @@
+ $(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 +62,17 @@
+@@ -60,17 +73,25 @@
lowtest_SOURCES = lowtest.cxx
lowtest_LDADD = \
@@ -152,11 +121,16 @@
- $(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 \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
- $(base_LIBS) -lz
++ $(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
decode_binobj_SOURCES = decode_binobj.cxx
@@ -165,59 +139,67 @@
- $(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 \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/bucket/libsgbucket.la \
+ $(top_builddir)/simgear/misc/libsgmisc.la \
- $(base_LIBS) -lz
-diff -Naur SimGear-0.3.5/simgear/magvar/Makefile.am SimGear-0.3.5-p/simgear/magvar/Makefile.am
---- SimGear-0.3.5/simgear/magvar/Makefile.am Fri Aug 29 19:36:28 2003
-+++ SimGear-0.3.5-p/simgear/magvar/Makefile.am Mon Mar 29 11:47:51 2004
++ $(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
@@ -1,10 +1,10 @@
- includedir = @includedir@/magvar
-
--lib_LIBRARIES = libsgmagvar.a
-+lib_LTLIBRARIES = libsgmagvar.la
+ includedir = @includedir@/bucket
- include_HEADERS = magvar.hxx
+-lib_LIBRARIES = libsgbucket.a
++lib_LTLIBRARIES = libsgbucket.la
--libsgmagvar_a_SOURCES = \
-+libsgmagvar_la_SOURCES = \
- coremag.hxx coremag.cxx \
- magvar.cxx
+ include_HEADERS = newbucket.hxx
-@@ -13,7 +13,7 @@
- testmagvar_SOURCES = testmagvar.cxx
+-libsgbucket_a_SOURCES = newbucket.cxx
++libsgbucket_la_SOURCES = newbucket.cxx
- testmagvar_LDADD = \
-- $(top_builddir)/simgear/magvar/libsgmagvar.a \
-+ $(top_builddir)/simgear/magvar/libsgmagvar.la \
- $(base_LIBS)
+ # noinst_PROGRAMS = testbucket
- INCLUDES = -I$(top_srcdir)
-diff -Naur SimGear-0.3.5/simgear/math/Makefile.am SimGear-0.3.5-p/simgear/math/Makefile.am
---- SimGear-0.3.5/simgear/math/Makefile.am Mon Jun 30 16:54:19 2003
-+++ SimGear-0.3.5-p/simgear/math/Makefile.am Mon Mar 29 11:47:51 2004
+--- 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@/math
+ includedir = @includedir@/xml
--lib_LIBRARIES = libsgmath.a
-+lib_LTLIBRARIES = libsgmath.la
+-lib_LIBRARIES = libsgxml.a
++lib_LTLIBRARIES = libsgxml.la
include_HEADERS = \
- interpolater.hxx \
-@@ -17,7 +17,7 @@
+ easyxml.hxx
+@@ -8,7 +8,7 @@
+ noinst_HEADERS = \
+ xmltok_impl.c xmltok_ns.c
- EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
+-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 @@
--libsgmath_a_SOURCES = \
-+libsgmath_la_SOURCES = \
- interpolater.cxx \
- leastsqs.cxx \
- polar3d.cxx \
-diff -Naur SimGear-0.3.5/simgear/misc/Makefile.am SimGear-0.3.5-p/simgear/misc/Makefile.am
---- SimGear-0.3.5/simgear/misc/Makefile.am Wed Dec 10 17:04:19 2003
-+++ SimGear-0.3.5-p/simgear/misc/Makefile.am Mon Mar 29 11:47:56 2004
+ 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)
+--- 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
@@ -1,6 +1,6 @@
includedir = @includedir@/misc
@@ -226,16 +208,16 @@
include_HEADERS = \
sg_path.hxx \
-@@ -12,7 +12,7 @@
- zfstream.hxx \
- interpolator.hxx
+@@ -13,7 +13,7 @@
+ interpolator.hxx \
+ stdint.hxx
-libsgmisc_a_SOURCES = \
+libsgmisc_la_SOURCES = \
sg_path.cxx \
sgstream.cxx \
strutils.cxx \
-@@ -25,8 +25,11 @@
+@@ -26,9 +26,12 @@
tabbed_value_test_SOURCES = tabbed_values_test.cxx
tabbed_value_test_LDADD = \
@@ -246,29 +228,94 @@
+ $(top_builddir)/simgear/xml/libsgxml.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/timing/libsgtiming.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)
+
+ 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
INCLUDES = -I$(top_srcdir)
-diff -Naur SimGear-0.3.5/simgear/nasal/Makefile.am SimGear-0.3.5-p/simgear/nasal/Makefile.am
---- SimGear-0.3.5/simgear/nasal/Makefile.am Thu Mar 18 15:51:23 2004
-+++ SimGear-0.3.5-p/simgear/nasal/Makefile.am Mon Mar 29 11:49:49 2004
-@@ -1,10 +1,10 @@
- includedir = @includedir@/nasal
+--- 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
--lib_LIBRARIES = libsgnasal.a
-+lib_LTLIBRARIES = libsgnasal.la
+-lib_LIBRARIES = libsgthreads.a
++lib_LTLIBRARIES = libsgthreads.la
- include_HEADERS = nasal.h
+ include_HEADERS = \
+ SGGuard.hxx \
+ SGQueue.hxx \
+ SGThread.hxx
--libsgnasal_a_SOURCES = \
-+libsgnasal_la_SOURCES = \
- code.c code.h \
- codegen.c \
- data.h \
-diff -Naur SimGear-0.3.5/simgear/props/Makefile.am SimGear-0.3.5-p/simgear/props/Makefile.am
---- SimGear-0.3.5/simgear/props/Makefile.am Tue Sep 30 17:36:51 2003
-+++ SimGear-0.3.5-p/simgear/props/Makefile.am Mon Mar 29 11:47:56 2004
+-libsgthreads_a_SOURCES = \
++libsgthreads_la_SOURCES = \
+ SGThread.cxx
+
+ 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 @@
includedir = @includedir@/props
@@ -285,7 +332,7 @@
condition.cxx \
props.cxx \
props_io.cxx
-@@ -16,10 +16,12 @@
+@@ -16,10 +16,11 @@
props_test_SOURCES = props_test.cxx
props_test_LDADD = \
@@ -299,13 +346,64 @@
+ $(top_builddir)/simgear/misc/libsgmisc.la \
+ $(top_builddir)/simgear/debug/libsgdebug.la \
+ $(top_builddir)/simgear/structure/libsgstructure.la \
-+ $(top_builddir)/simgear/timing/libsgtiming.la \
+ -lz
INCLUDES = -I$(top_srcdir)
-diff -Naur SimGear-0.3.5/simgear/route/Makefile.am SimGear-0.3.5-p/simgear/route/Makefile.am
---- SimGear-0.3.5/simgear/route/Makefile.am Fri Aug 29 19:36:29 2003
-+++ SimGear-0.3.5-p/simgear/route/Makefile.am Mon Mar 29 11:47:56 2004
+--- 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
@@ -319,7 +417,7 @@
route.cxx \
waypoint.cxx
-@@ -15,17 +15,19 @@
+@@ -15,17 +15,25 @@
waytest_SOURCES = waytest.cxx
waytest_LDADD = \
@@ -331,6 +429,9 @@
+ $(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
@@ -340,75 +441,18 @@
- $(top_builddir)/simgear/route/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/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
- $(base_LIBS)
-diff -Naur SimGear-0.3.5/simgear/scene/material/Makefile.am SimGear-0.3.5-p/simgear/scene/material/Makefile.am
---- SimGear-0.3.5/simgear/scene/material/Makefile.am Fri May 16 15:21:20 2003
-+++ SimGear-0.3.5-p/simgear/scene/material/Makefile.am Mon Mar 29 11:47:56 2004
-@@ -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 -Naur SimGear-0.3.5/simgear/scene/model/Makefile.am SimGear-0.3.5-p/simgear/scene/model/Makefile.am
---- SimGear-0.3.5/simgear/scene/model/Makefile.am Fri May 16 15:21:20 2003
-+++ SimGear-0.3.5-p/simgear/scene/model/Makefile.am Mon Mar 29 11:47:56 2004
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/model
-
--lib_LIBRARIES = libsgmodel.a
-+lib_LTLIBRARIES = libsgmodel.la
-
- noinst_HEADERS =
-
-@@ -11,7 +11,7 @@
- modellib.hxx \
- placement.hxx
-
--libsgmodel_a_SOURCES = \
-+libsgmodel_la_SOURCES = \
- animation.cxx \
- location.cxx \
- model.cxx \
-diff -Naur SimGear-0.3.5/simgear/scene/tgdb/Makefile.am SimGear-0.3.5-p/simgear/scene/tgdb/Makefile.am
---- SimGear-0.3.5/simgear/scene/tgdb/Makefile.am Tue Dec 30 20:36:48 2003
-+++ SimGear-0.3.5-p/simgear/scene/tgdb/Makefile.am Mon Mar 29 11:47:56 2004
-@@ -1,6 +1,6 @@
- includedir = @includedir@/scene/tgdb
-
--lib_LIBRARIES = libsgtgdb.a
-+lib_LTLIBRARIES = libsgtgdb.la
-
- noinst_HEADERS =
-
-@@ -12,7 +12,7 @@
- userdata.hxx \
- vasi.hxx
-
--libsgtgdb_a_SOURCES = \
-+libsgtgdb_la_SOURCES = \
- apt_signs.cxx \
- leaf.cxx \
- obj.cxx \
-diff -Naur SimGear-0.3.5/simgear/screen/Makefile.am SimGear-0.3.5-p/simgear/screen/Makefile.am
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/SimGear-shared.patch?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list