From: Sebastian Zagrodzki Date: Fri, 13 Sep 2002 19:30:15 +0000 (+0000) Subject: daf0db8ff92e3d3a61a814f90b148b0b FlightGear-0.8.0.tar.gz X-Git-Tag: FlightGear-0_8_0-1~2 X-Git-Url: https://git.pld-linux.org/?p=packages%2FFlightGear.git;a=commitdiff_plain;h=e42e489c6e6e7e222819cdbe190a28378d4b498c daf0db8ff92e3d3a61a814f90b148b0b FlightGear-0.8.0.tar.gz dc44ddf301cd78c2e8f86e45a474b9f7 fgfs-base-0.8.0.tar.gz Changed files: FlightGear-ac_fix.patch -> 1.2 FlightGear-am_fix.patch -> 1.2 FlightGear-libs.patch -> 1.3 --- diff --git a/FlightGear-ac_fix.patch b/FlightGear-ac_fix.patch deleted file mode 100644 index c239b2f..0000000 --- a/FlightGear-ac_fix.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff -urN FlightGear-0.7.10.orig/configure.in FlightGear-0.7.10/configure.in ---- FlightGear-0.7.10.orig/configure.in Wed Aug 28 20:12:25 2002 -+++ FlightGear-0.7.10/configure.in Wed Aug 28 20:25:51 2002 -@@ -56,8 +56,10 @@ - AM_CONDITIONAL(ANCIENT_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 14) - AM_CONDITIONAL(OLD_AUTOMAKE, test $AUTO_MAKE_VERSION -lt 15) - -+AM_CONDITIONAL(ENABLE_XMESA_FX, [false]) -+ - # Used by JSBSim --AC_DEFINE( FGFS ) -+AC_DEFINE( FGFS,,[fucken] ) - - AR="ar" - OS=`uname -s` -@@ -73,7 +75,7 @@ - # with_logging=yes - AC_ARG_WITH(logging, [ --with-logging Include logging output (default)]) - if test "x$with_logging" = "xno" ; then -- AC_DEFINE( FG_NDEBUG ) -+ AC_DEFINE( FG_NDEBUG,,[fucken] ) - fi - - -@@ -104,7 +106,7 @@ - echo "Building without Oliver's multi-pilot network support" - else - echo "Building with Oliver's multi-pilot network support" -- AC_DEFINE( FG_NETWORK_OLK ) -+ AC_DEFINE( FG_NETWORK_OLK,,[fucken] ) - fi - AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno") - -@@ -124,7 +126,7 @@ - echo " ftp://ftp.uu.net in the directory graphics/jpeg" - exit 1 - fi -- AC_DEFINE( FG_JPEG_SERVER ) -+ AC_DEFINE( FG_JPEG_SERVER,,[fucken] ) - fi - AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$ac_cv_header_simgear_screen_jpgfactory_hxx" = "xyes") - -@@ -133,7 +135,7 @@ - AC_ARG_WITH(new-environment, [ --with-new-environment Include new experimental environment subsystem]) - if test "x$with_new_environment" = "xyes" ; then - echo "Building with new environment subsystem" -- AC_DEFINE( FG_NEW_ENVIRONMENT ) -+ AC_DEFINE( FG_NEW_ENVIRONMENT,,[fucken] ) - else - echo "Building with old weather subsystem" - fi -@@ -144,7 +146,7 @@ - AC_ARG_WITH(old-mouse, [ --with-old-mouse Disable new mouse input support]) - if test "x$with_old_mouse" = "xyes" ; then - echo "Building with old mouse subsystem" -- AC_DEFINE( FG_OLD_MOUSE ) -+ AC_DEFINE( FG_OLD_MOUSE,,[fucken] ) - else - echo "Building with new mouse subsystem" - fi -@@ -157,7 +159,7 @@ - dnl Thread related checks - AC_ARG_WITH(threads, [ --with-threads Include tile loading threads [default=no]]) - if test "x$with_threads" = "xyes"; then -- AC_DEFINE(ENABLE_THREADS) -+ AC_DEFINE(ENABLE_THREADS,,[fucken]) - CXXFLAGS="$CXXFLAGS -D_REENTRANT" - CFLAGS="$CFLAGS -D_REENTRANT" - AC_CHECK_HEADER(pthread.h) -@@ -208,13 +210,13 @@ - # Check for external variables daylight and timezone. - AC_EXT_DAYLIGHT - if test "$have_daylight" = yes; then -- AC_DEFINE( HAVE_DAYLIGHT ) -+ AC_DEFINE( HAVE_DAYLIGHT,,[fucken] ) - fi - # AM_CONDITIONAL(HAVE_DAYLIGHT, test "$have_daylight" = yes ) - - AC_EXT_TIMEZONE - if test "$have_timezone" = yes; then -- AC_DEFINE( HAVE_TIMEZONE ) -+ AC_DEFINE( HAVE_TIMEZONE,,[fucken] ) - fi - # AM_CONDITIONAL(HAVE_TIMEZONE, test "$have_timezone" = yes ) - -@@ -228,7 +230,7 @@ - -o "x$ac_cv_header_windows_h" = "xyes" \ - -o "$HOSTTYPE" = "macintosh"; then - -- AC_DEFINE( ENABLE_AUDIO_SUPPORT ) -+ AC_DEFINE( ENABLE_AUDIO_SUPPORT,,[fucken] ) - audio_LIBS="-lplibsl -lplibsm" - AC_MSG_RESULT(yes) - if test -r /usr/include/audio.h; then -@@ -309,13 +311,13 @@ - save_LIBS="$LIBS" - AC_CHECK_LIB(GL, XMesaSetFXmode) - if test "x$ac_cv_lib_GL_XMesaSetFXmode" = "xyes" ; then -- AC_DEFINE( XMESA ) -- AC_DEFINE( FX ) -+ AC_DEFINE( XMESA,,[fucken] ) -+ AC_DEFINE( FX,,[fucken]) - else - AC_CHECK_LIB(MesaGL, XMesaSetFXmode) - if test "x$ac_cv_lib_MesaGL_XMesaSetFXmode" = "xyes" ; then -- AC_DEFINE( XMESA ) -- AC_DEFINE( FX ) -+ AC_DEFINE( XMESA,,[fucken] ) -+ AC_DEFINE( FX,,[fucken]) - fi - fi - LIBS="$save_LIBS" -@@ -340,11 +342,11 @@ - # winbloze-isms. We'll just do this manually for now. - - echo Win32 specific hacks... -- AC_DEFINE( WIN32 ) -+ AC_DEFINE( WIN32,,[fucken]) - - # force a failed check since we will be building under windoze - AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes") -- -+ - # just define these to true and hope for the best - ac_cv_lib_glut_glutGetModifiers="yes" - ac_cv_lib_glut_glutGameModeString="yes" -@@ -419,7 +421,7 @@ - # AC_CHECK_LIB(glut, glutGameModeString) - - # If we get here then plib is available, so force use of plib joystick lib --AC_DEFINE( ENABLE_PLIB_JOYSTICK ) -+AC_DEFINE( ENABLE_PLIB_JOYSTICK,,[fucken] ) - - # Do we have a new CVS plib version with jsJoystick::getName? - echo -n "Testing for Plib joystick getName support: " -@@ -427,7 +429,7 @@ - plib_js_has_getname=yes, plib_js_has_getname=no ) - echo $plib_js_has_getname - if test $plib_js_has_getname = 'yes'; then -- AC_DEFINE(FG_PLIB_JOYSTICK_GETNAME) -+ AC_DEFINE(FG_PLIB_JOYSTICK_GETNAME,,[fucken]) - fi - - # Check for the presence of SimGear -@@ -483,7 +485,7 @@ - # Check for MetaKit - AC_CHECK_HEADER(mk4.h) - if test "x$ac_cv_header_mk4_h" = "xyes"; then -- AC_DEFINE( HAVE_MK4 ) -+ AC_DEFINE( HAVE_MK4,,[fucken] ) - else - echo - echo "MetaKit library not found." -@@ -501,7 +503,7 @@ - # Check for system installed zlib - AC_CHECK_HEADER(zlib.h) - if test "x$ac_cv_header_zlib_h" = "xyes"; then -- AC_DEFINE( HAVE_ZLIB ) -+ AC_DEFINE( HAVE_ZLIB,,[fucken] ) - else - echo - echo "zlib library not found." diff --git a/FlightGear-am_fix.patch b/FlightGear-am_fix.patch deleted file mode 100644 index 16d8162..0000000 --- a/FlightGear-am_fix.patch +++ /dev/null @@ -1,365 +0,0 @@ -diff -urN FlightGear-0.7.10.orig/src/ATC/Makefile.am FlightGear-0.7.10/src/ATC/Makefile.am ---- FlightGear-0.7.10.orig/src/ATC/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/ATC/Makefile.am Fri May 10 23:11:50 2002 -@@ -12,8 +12,5 @@ - AIEntity.hxx AIEntity.cxx \ - AILocalTraffic.hxx AILocalTraffic.cxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Aircraft/Makefile.am FlightGear-0.7.10/src/Aircraft/Makefile.am ---- FlightGear-0.7.10.orig/src/Aircraft/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Aircraft/Makefile.am Fri May 10 23:12:01 2002 -@@ -2,8 +2,5 @@ - - libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Airports/Makefile.am FlightGear-0.7.10/src/Airports/Makefile.am ---- FlightGear-0.7.10.orig/src/Airports/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Airports/Makefile.am Fri May 10 23:12:29 2002 -@@ -12,8 +12,5 @@ - genrunways_SOURCES = genrunways.cxx - genrunways_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Autopilot/Makefile.am FlightGear-0.7.10/src/Autopilot/Makefile.am ---- FlightGear-0.7.10.orig/src/Autopilot/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Autopilot/Makefile.am Fri May 10 23:12:45 2002 -@@ -4,8 +4,5 @@ - auto_gui.cxx auto_gui.hxx \ - newauto.cxx newauto.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Cockpit/Makefile.am FlightGear-0.7.10/src/Cockpit/Makefile.am ---- FlightGear-0.7.10.orig/src/Cockpit/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Cockpit/Makefile.am Fri May 10 23:12:56 2002 -@@ -12,10 +12,6 @@ - radiostack.cxx radiostack.hxx \ - steam.cxx steam.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif - - SUBDIRS = built_in -diff -urN FlightGear-0.7.10.orig/src/Cockpit/built_in/Makefile.am FlightGear-0.7.10/src/Cockpit/built_in/Makefile.am ---- FlightGear-0.7.10.orig/src/Cockpit/built_in/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Cockpit/built_in/Makefile.am Fri May 10 23:13:10 2002 -@@ -3,9 +3,5 @@ - libBuilt_in_a_SOURCES = \ - FGMagRibbon.cxx FGMagRibbon.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif - -diff -urN FlightGear-0.7.10.orig/src/Controls/Makefile.am FlightGear-0.7.10/src/Controls/Makefile.am ---- FlightGear-0.7.10.orig/src/Controls/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Controls/Makefile.am Fri May 10 23:13:21 2002 -@@ -2,8 +2,5 @@ - - libControls_a_SOURCES = controls.cxx controls.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Environment/Makefile.am FlightGear-0.7.10/src/Environment/Makefile.am ---- FlightGear-0.7.10.orig/src/Environment/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Environment/Makefile.am Fri May 10 23:13:37 2002 -@@ -7,8 +7,5 @@ - libEnvironment_a_SOURCES = environment.cxx environment.hxx \ - environment_mgr.cxx environment_mgr.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/FDM/Balloon/Makefile.am FlightGear-0.7.10/src/FDM/Balloon/Makefile.am ---- FlightGear-0.7.10.orig/src/FDM/Balloon/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/FDM/Balloon/Makefile.am Fri May 10 23:13:49 2002 -@@ -2,8 +2,5 @@ - - libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/FDM/JSBSim/Makefile.am FlightGear-0.7.10/src/FDM/JSBSim/Makefile.am ---- FlightGear-0.7.10.orig/src/FDM/JSBSim/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/FDM/JSBSim/Makefile.am Fri May 10 23:14:05 2002 -@@ -54,11 +54,6 @@ - - # noinst_PROGRAMS = testJSBsim - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --DEFS += -DFGFS --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src - AM_CXXFLAGS = -DFGFS --endif - -diff -urN FlightGear-0.7.10.orig/src/FDM/JSBSim/filtersjb/Makefile.am FlightGear-0.7.10/src/FDM/JSBSim/filtersjb/Makefile.am ---- FlightGear-0.7.10.orig/src/FDM/JSBSim/filtersjb/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/FDM/JSBSim/filtersjb/Makefile.am Fri May 10 23:14:38 2002 -@@ -12,11 +12,6 @@ - FGSummer.cpp FGSummer.h \ - FGSwitch.cpp FGSwitch.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --DEFS += -DFGFS --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src - AM_CXXFLAGS = -DFGFS --endif - -diff -urN FlightGear-0.7.10.orig/src/FDM/LaRCsim/Makefile.am FlightGear-0.7.10/src/FDM/LaRCsim/Makefile.am ---- FlightGear-0.7.10.orig/src/FDM/LaRCsim/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/FDM/LaRCsim/Makefile.am Fri May 10 23:15:01 2002 -@@ -32,8 +32,5 @@ - $(AIRCRAFT_MODEL) \ - ls_interface.c ls_interface.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/FDM/Makefile.am FlightGear-0.7.10/src/FDM/Makefile.am ---- FlightGear-0.7.10.orig/src/FDM/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/FDM/Makefile.am Fri May 10 23:15:16 2002 -@@ -14,8 +14,5 @@ - MagicCarpet.cxx MagicCarpet.hxx \ - NullFDM.cxx NullFDM.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/FDM/UIUCModel/Makefile.am FlightGear-0.7.10/src/FDM/UIUCModel/Makefile.am ---- FlightGear-0.7.10.orig/src/FDM/UIUCModel/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/FDM/UIUCModel/Makefile.am Fri May 10 23:15:28 2002 -@@ -52,8 +52,5 @@ - uiuc_warnings_errors.cpp uiuc_warnings_errors.h \ - uiuc_wrapper.cpp uiuc_wrapper.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/FDM/YASim/Makefile.am FlightGear-0.7.10/src/FDM/YASim/Makefile.am ---- FlightGear-0.7.10.orig/src/FDM/YASim/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/FDM/YASim/Makefile.am Fri May 10 23:15:39 2002 -@@ -23,8 +23,5 @@ - Vector.hpp \ - Wing.cpp Wing.hpp - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/GUI/Makefile.am FlightGear-0.7.10/src/GUI/Makefile.am ---- FlightGear-0.7.10.orig/src/GUI/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/GUI/Makefile.am Fri May 10 23:15:51 2002 -@@ -16,8 +16,5 @@ - sgVec3Slider.cxx sgVec3Slider.hxx \ - trackball.c trackball.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Input/Makefile.am FlightGear-0.7.10/src/Input/Makefile.am ---- FlightGear-0.7.10.orig/src/Input/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Input/Makefile.am Fri May 10 23:16:04 2002 -@@ -12,8 +12,5 @@ - - fgjs_LDADD = $(audio_LIBS) - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Main/Makefile.am FlightGear-0.7.10/src/Main/Makefile.am ---- FlightGear-0.7.10.orig/src/Main/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Main/Makefile.am Fri May 10 23:16:20 2002 -@@ -90,10 +90,6 @@ - - fgfs_CFLAGS = -DTHIS_IS_A_TEST - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif - - -diff -urN FlightGear-0.7.10.orig/src/Model/Makefile.am FlightGear-0.7.10/src/Model/Makefile.am ---- FlightGear-0.7.10.orig/src/Model/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Model/Makefile.am Fri May 10 23:16:29 2002 -@@ -4,8 +4,5 @@ - modelmgr.cxx modelmgr.hxx \ - acmodel.cxx acmodel.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Navaids/Makefile.am FlightGear-0.7.10/src/Navaids/Makefile.am ---- FlightGear-0.7.10.orig/src/Navaids/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Navaids/Makefile.am Fri May 10 23:16:40 2002 -@@ -14,8 +14,5 @@ - -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \ - -lz - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Network/Makefile.am FlightGear-0.7.10/src/Network/Makefile.am ---- FlightGear-0.7.10.orig/src/Network/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Network/Makefile.am Fri May 10 23:16:51 2002 -@@ -26,8 +26,5 @@ - ray.cxx ray.hxx \ - rul.cxx rul.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/NetworkOLK/Makefile.am FlightGear-0.7.10/src/NetworkOLK/Makefile.am ---- FlightGear-0.7.10.orig/src/NetworkOLK/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/NetworkOLK/Makefile.am Fri May 10 23:17:02 2002 -@@ -3,8 +3,5 @@ - libNetworkOLK_a_SOURCES = \ - net_send.cxx net_hud.cxx network.cxx network.h fgd.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Objects/Makefile.am FlightGear-0.7.10/src/Objects/Makefile.am ---- FlightGear-0.7.10.orig/src/Objects/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Objects/Makefile.am Fri May 10 23:17:11 2002 -@@ -8,8 +8,5 @@ - obj.cxx obj.hxx \ - texload.c texload.h colours.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Scenery/Makefile.am FlightGear-0.7.10/src/Scenery/Makefile.am ---- FlightGear-0.7.10.orig/src/Scenery/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Scenery/Makefile.am Fri May 10 23:17:21 2002 -@@ -8,8 +8,5 @@ - tileentry.cxx tileentry.hxx \ - tilemgr.cxx tilemgr.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Sound/Makefile.am FlightGear-0.7.10/src/Sound/Makefile.am ---- FlightGear-0.7.10.orig/src/Sound/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Sound/Makefile.am Fri May 10 23:17:32 2002 -@@ -7,8 +7,5 @@ - morse.cxx morse.hxx \ - soundmgr.cxx soundmgr.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/Time/Makefile.am FlightGear-0.7.10/src/Time/Makefile.am ---- FlightGear-0.7.10.orig/src/Time/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/Time/Makefile.am Fri May 10 23:17:42 2002 -@@ -8,8 +8,5 @@ - sunpos.cxx sunpos.hxx \ - tmp.cxx tmp.hxx - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ -diff -urN FlightGear-0.7.10.orig/src/WeatherCM/Makefile.am FlightGear-0.7.10/src/WeatherCM/Makefile.am ---- FlightGear-0.7.10.orig/src/WeatherCM/Makefile.am Fri May 10 23:08:45 2002 -+++ FlightGear-0.7.10/src/WeatherCM/Makefile.am Fri May 10 23:17:54 2002 -@@ -19,8 +19,5 @@ - linintp2.cpp linintp2.h \ - sphrintp.cpp sphrintp.h - --if OLD_AUTOMAKE --INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src --else - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --endif -+ ---- FlightGear-0.7.10.origtests/Makefile.am~ Tue Mar 5 01:20:50 2002 -+++ FlightGear-0.7.10/tests/Makefile.am Fri May 10 23:31:04 2002 -@@ -21,4 +21,4 @@ - test_text_LDADD = $(base_LIBS) - - test_up_SOURCES = test-up.cxx --test_up_LDADD = -lsgmath -lsgdebug -lplibsg $(base_LIBS) -+test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lsgmisc -lz -lsgxml $(base_LIBS) diff --git a/FlightGear-libs.patch b/FlightGear-libs.patch new file mode 100644 index 0000000..fdc7f2d --- /dev/null +++ b/FlightGear-libs.patch @@ -0,0 +1,9 @@ +diff -Naur FlightGear-0.8.0/tests/Makefile.am FlightGear-0.8.0-p/tests/Makefile.am +--- FlightGear-0.8.0/tests/Makefile.am Tue Sep 3 00:24:33 2002 ++++ FlightGear-0.8.0-p/tests/Makefile.am Fri Sep 13 21:02:27 2002 +@@ -21,4 +21,4 @@ + test_text_LDADD = $(base_LIBS) + + test_up_SOURCES = test-up.cxx +-test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul $(base_LIBS) ++test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul -lsgmisc -lsgxml -lz $(base_LIBS)