Hello community, here is the log from the commit of package FlightGear checked in at Fri May 25 17:24:59 CEST 2007. -------- --- FlightGear/FlightGear.changes 2007-02-14 17:08:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/FlightGear/FlightGear.changes 2007-05-25 16:47:11.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 25 16:44:54 CEST 2007 - lmichnovic@suse.cz + +- added renamed package plib-devel for BuildReq +- removing header files +- added upstream paatches: + * flightgear.plib-dependencies.patch + * simgear.plib-dependencies.patch -> make -j can be used again + * flightgear.plib-glut-SDL.patch + * simgear.plib-distclean.patch +- fixed PPC CPU detection (ppc_detect.patch) + +------------------------------------------------------------------- +Wed May 16 17:30:07 CEST 2007 - lmichnovic@suse.cz + +- update to version 0.9.11-pre1 +- updated SimGear*uninitialized.patch +- specifying x-libs and x-headers + +------------------------------------------------------------------- Old: ---- FlightGear-0.9.10-aoverflow.patch FlightGear-0.9.10.tar.bz2 SimGear-0.3.10-strict_alias.patch SimGear-0.3.10.tar.bz2 SimGear-0.3.10-uninitialized.patch New: ---- FlightGear-0.9.10-array_overflow.patch FlightGear-0.9.11-pre1.tar.bz2 flightgear.plib-dependencies.patch flightgear.plib-glut-SDL.patch SimGear-0.3.11-pre1-ppc_detect.patch SimGear-0.3.11-pre1-strict_alias.patch SimGear-0.3.11-pre1.tar.bz2 SimGear-0.3.11-pre1-uninitialized.patch simgear.plib-dependencies.patch simgear.plib-distclean.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FlightGear.spec ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package FlightGear (Version 0.9.10) +# spec file for package FlightGear (Version 0.9.10.9.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,26 +11,42 @@ # norootforbuild Name: FlightGear -BuildRequires: freealut-devel freeglut-devel gcc-c++ libdrm-devel openal-devel plib update-desktop-files xorg-x11 +%if %suse_version < 1010 +BuildRequires: freeglut-devel gcc-c++ openal-devel plib update-desktop-files xorg-x11 +%else +BuildRequires: freeglut-devel gcc-c++ libdrm-devel openal-devel plib update-desktop-files xorg-x11 +%endif +%if %suse_version > 1020 +BuildRequires: plib-devel +%endif +# openal is splitted in 10.2 into openal and freealut. +%if %suse_version > 1010 +BuildRequires: freealut-devel +%endif License: GNU General Public License (GPL) Group: Amusements/Games/3D/Simulation Autoreqprov: on -Version: 0.9.10 -Release: 43 +Version: 0.9.10.9.1 +Release: 1 Provides: flightgr Obsoletes: flightgr PreReq: /bin/ln Summary: FlightGear Flight Simulator URL: http://www.flightgear.org/ -Source: %{name}-%{version}.tar.bz2 -%define simgear SimGear-0.3.10 +Source: %{name}-0.9.11-pre1.tar.bz2 +%define simgear SimGear-0.3.11-pre1 Source1: %{simgear}.tar.bz2 Patch1: %{name}-0.9.10-browser.patch Patch2: %{name}-0.9.10-64bit.patch Patch3: %{name}-0.9.10-test.patch -Patch4: %{name}-0.9.10-aoverflow.patch +Patch4: %{name}-0.9.10-array_overflow.patch +Patch5: flightgear.plib-dependencies.patch +Patch6: flightgear.plib-glut-SDL.patch Patch10: %{simgear}-uninitialized.patch Patch11: %{simgear}-strict_alias.patch +Patch12: simgear.plib-dependencies.patch +Patch13: simgear.plib-distclean.patch +Patch14: SimGear-0.3.11-pre1-ppc_detect.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: FlightGear-data = %version @@ -101,15 +117,20 @@ %if %suse_version < 1000 exit 1 %endif -%setup -q -b 1 +%setup -n FlightGear-0.9.11-pre1 -q -b 1 pushd ../%{simgear} %patch10 %patch11 +%patch12 -p1 +%patch13 -p1 +%patch14 popd %patch1 %patch2 %patch3 %patch4 +%patch5 -p1 +%patch6 -p1 rm -fv docs-mini/FlightGear-FAQ.html.~1.3.~ %build @@ -117,8 +138,15 @@ mkdir /var/tmp/tmpinstall export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# beware where is the X libraries installed (X.org 6.9 vs. 7.x) +%if "%(xft-config --prefix)" == "/usr" +CONFIGURE_OPTIONS="--prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \ +--infodir=%{_infodir} --sysconfdir=%{_sysconfdir} --without-logging \ +--x-includes=/usr/include --x-libraries=/usr/%{_lib}" +%else CONFIGURE_OPTIONS="--prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} \ --infodir=%{_infodir} --sysconfdir=%{_sysconfdir} --without-logging" +%endif # # SimGear build and install # don't use make %{?jobs:-j%jobs}, fails on some archs everytime @@ -128,20 +156,27 @@ autoreconf --force --install CPPFLAGS="-I /var/tmp/tmpinstall/%{_includedir}" ./configure $CONFIGURE_OPTIONS \ LDFLAGS=-L/var/tmp/tmpinstall/usr/%{_lib} -make +make %{?jobs:-j%jobs} make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=/var/tmp/tmpinstall install -cd ../%{name}-%{version} +cd ../%{name}-0.9.11-pre1 # # FlightGear finally # don't use make %{?jobs:-j%jobs}, fails sometimes on every archs. # autoreconf --force --install %{?suse_update_config:%{suse_update_config -f}} +# beware where is the X libraries installed (X.org 6.9 vs. 7.x) +%if "%(xft-config --prefix)" == "/usr" +./configure $CONFIGURE_OPTIONS --with-x --with-simgear=/var/tmp/tmpinstall/usr \ + LDFLAGS=-L/var/tmp/tmpinstall/usr/%{_lib} \ + --x-includes=/usr/include --x-libraries=/usr/%{_lib} +%else ./configure $CONFIGURE_OPTIONS --with-x --with-simgear=/var/tmp/tmpinstall/usr \ LDFLAGS=-L/var/tmp/tmpinstall/usr/%{_lib} -make -# use sdl instead of glut if some problems to run FG +%endif +make %{?jobs:-j%jobs} +# use sdl instead of glut if some problems to run FG, no need to do so now, freeglut is fixed in Suse # --enable-sdl %install @@ -161,8 +196,24 @@ /usr/include/* /usr/%{_lib}/lib* /usr/share/applications/%name.desktop - -%changelog -n FlightGear +%exclude /usr/%{_lib}/*.a +%exclude /usr/include/simgear/*.h +%exclude /usr/include/simgear/*/*.h + +%changelog +* Fri May 25 2007 - lmichnovic@suse.cz +- added renamed package plib-devel for BuildReq +- removing header files +- added upstream paatches: + * flightgear.plib-dependencies.patch + * simgear.plib-dependencies.patch -> make -j can be used again + * flightgear.plib-glut-SDL.patch + * simgear.plib-distclean.patch +- fixed PPC CPU detection (ppc_detect.patch) +* Wed May 16 2007 - lmichnovic@suse.cz +- update to version 0.9.11-pre1 +- updated SimGear*uninitialized.patch +- specifying x-libs and x-headers * Wed Feb 14 2007 - mvaner@suse.cz - Fixed array overflow, #242362 (aoverflow.patch) * Tue Oct 24 2006 - ro@suse.de ++++++ FlightGear-0.9.10-64bit.patch ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:54.000000000 +0200 @@ -1,6 +1,6 @@ ---- src/Scripting/NasalSys.cxx 2005-04-28 17:45:29.000000000 +0200 -+++ src/Scripting/NasalSys.cxx 2005-04-28 17:45:44.000000000 +0200 -@@ -86,7 +86,7 @@ +--- src/Scripting/NasalSys.cxx ++++ src/Scripting/NasalSys.cxx +@@ -117,7 +117,7 @@ char buf[256]; if(!name) { ++++++ FlightGear-0.9.10-array_overflow.patch ++++++ --- src/FDM/JSBSim/models/FGFCS.cpp +++ src/FDM/JSBSim/models/FGFCS.cpp @@ -77,7 +77,7 @@ LeftBrake = RightBrake = CenterBrake = 0.0; bind(); - for (i=0;i<=NForms;i++) { + for (i=0;i<NForms;i++) { DePos[i] = DaLPos[i] = DaRPos[i] = DrPos[i] = 0.0; DfPos[i] = DsbPos[i] = DspPos[i] = 0.0; } ++++++ FlightGear-0.9.10-browser.patch ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:55.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:55.000000000 +0200 @@ -11,7 +11,7 @@ echo "You need to upgrade to automake version 1.5 or greater." --- src/GUI/gui_funcs.cxx +++ src/GUI/gui_funcs.cxx -@@ -222,6 +222,8 @@ +@@ -183,6 +183,8 @@ void helpCb (puObject *) { string command; @@ -20,7 +20,7 @@ #if defined(FX) && !defined(WIN32) # if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW) -@@ -239,11 +241,18 @@ +@@ -200,11 +202,18 @@ string help_app = fgGetString("/sim/startup/browser-app"); @@ -41,7 +41,7 @@ command += " &"; system( command.c_str() ); -@@ -264,8 +273,13 @@ +@@ -225,8 +234,13 @@ SW_SHOWNORMAL ) ; #endif ++++++ FlightGear-0.9.10-test.patch ++++++ --- /var/tmp/diff_new_pack.hY3520/_old 2007-05-25 17:24:55.000000000 +0200 +++ /var/tmp/diff_new_pack.hY3520/_new 2007-05-25 17:24:55.000000000 +0200 @@ -2,10 +2,10 @@ +++ tests/test-text.cxx @@ -4,7 +4,7 @@ #include <string.h> - + static void readchars( FILE *fd ) { - char c; + int c; while ( (c = fgetc(fd)) != EOF ) { - printf("c = %d", c); - if ( c == 10 ) { + printf("c = %d", c); + if ( c == 10 ) { ++++++ flightgear.plib-dependencies.patch ++++++ commit f2949dca7ae2b6264184ad256ff33b67e5c087c8 Author: Pigeon <pigeon@pigeond.net> Date: Tue May 15 22:24:25 2007 +1000 src/Main/Makefile.am dependencies fix diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 5ac0cf0..fdc5809 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -60,7 +60,7 @@ libMain_a_SOURCES = \ fgfs_SOURCES = bootstrap.cxx fgfs_LDADD = \ - $(top_builddir)/src/Main/libMain.a \ + libMain.a \ $(top_builddir)/src/Aircraft/libAircraft.a \ $(top_builddir)/src/ATC/libATC.a \ $(top_builddir)/src/Cockpit/libCockpit.a \ ++++++ flightgear.plib-glut-SDL.patch ++++++ commit 43eb8463a884e68c19aa3ac1c71adc6dd7a16ea7 Author: Pigeon <pigeon@pigeond.net> Date: Fri May 18 21:23:40 2007 +1000 Not linking against glut when using SDL. diff --git a/configure.ac b/configure.ac index 0548591..1fe08f3 100644 --- a/configure.ac +++ b/configure.ac @@ -265,9 +265,10 @@ case "${host}" in fi AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ]) - AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ]) if test "x$enable_sdl" = "xyes"; then AC_SEARCH_LIBS(SDL_Init, SDL) + else + AC_SEARCH_LIBS(glutGetModifiers, [ glut freeglut ]) fi ;; diff --git a/tests/gl-info.c b/tests/gl-info.c index 4aff41d..1410b7b 100644 --- a/tests/gl-info.c +++ b/tests/gl-info.c @@ -20,7 +20,14 @@ Date: Fri, 24 Apr 1998 07:33:51 -0800 #include <simgear/compiler.h> +#if defined(PU_USE_GLUT) #include SG_GLUT_H +#elif defined(PU_USE_SDL) +#include <SDL/SDL.h> +#include <GL/gl.h> +#else +#error FlightGear is not configured to use either GLUT or SDL +#endif void getPrints ( GLenum token, char *string ) @@ -58,9 +65,16 @@ void getPrinti ( GLenum token, char *string ) int main ( int argc, char **argv ) { +#if defined(PU_USE_GLUT) glutInit ( &argc, argv ) ; glutInitDisplayMode ( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ) ; glutCreateWindow ( "You should never see this window!" ) ; +#elif defined(PU_USE_SDL) + SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); + atexit(SDL_Quit); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_SetVideoMode(320, 240, 0, SDL_OPENGL); +#endif getPrints ( GL_VENDOR , "GL_VENDOR" ) ; getPrints ( GL_RENDERER , "GL_RENDERER" ) ; diff --git a/tests/test-env-map.cxx b/tests/test-env-map.cxx index 6d369ef..3c9ed0c 100644 --- a/tests/test-env-map.cxx +++ b/tests/test-env-map.cxx @@ -12,7 +12,15 @@ #include <simgear/compiler.h> +#if defined(PU_USE_GLUT) #include SG_GLUT_H +#elif defined(PU_USE_SDL) +#include <SDL/SDL.h> +#include <GL/gl.h> +#include <GL/glu.h> +#else +#error FlightGear is not configured to use either GLUT or SDL +#endif #define TEXRES_X 256 #define TEXRES_Y 256 @@ -23,6 +31,10 @@ GLuint texName; int window_x = 640, window_y = 480; float alpha = 0.0, beta = 0.0; +#if defined(PU_USE_SDL) +static bool NeedRedraw = false; +#endif + /*****************************************************************/ /*****************************************************************/ /*****************************************************************/ @@ -207,8 +219,12 @@ void display() glFlush(); glDisable(GL_TEXTURE_2D); +#if defined(PU_USE_GLUT) glutPostRedisplay () ; glutSwapBuffers () ; +#elif defined(PU_USE_SDL) + NeedRedraw = true; +#endif } void keyboard (unsigned char key, int x, int y) @@ -244,18 +260,63 @@ void keyboard (unsigned char key, int x, int y) } } +#if defined(PU_USE_SDL) +void sdlMainLoop() +{ + display(); + while(1) { + SDL_Event e; + int key; + while(SDL_PollEvent(&e)) { + switch(e.type) { + case SDL_QUIT: + break; + case SDL_KEYDOWN: + key = e.key.keysym.sym; + keyboard(key, 0, 0); + display (); + break; + case SDL_VIDEORESIZE: + SDL_SetVideoMode(e.resize.w, e.resize.h, 0, SDL_OPENGL|SDL_RESIZABLE); + reshape(e.resize.w, e.resize.h); + break; + case SDL_VIDEOEXPOSE: + display (); + break; + } + } + if(NeedRedraw) { + SDL_GL_SwapBuffers (); + } + } +} +#endif + int main(int argc, char** argv) { +#if defined(PU_USE_GLUT) glutInitWindowSize(window_x, window_y); glutInit(&argc, argv); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); glutCreateWindow(argv[0]); +#elif defined(PU_USE_SDL) + SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_SetVideoMode(window_x, window_y, 0, SDL_OPENGL|SDL_RESIZABLE); + SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); +#endif + init(); + +#if defined(PU_USE_GLUT) glutDisplayFunc(display); glutReshapeFunc(reshape); glutKeyboardFunc(keyboard); - glutMainLoop(); +#elif defined(PU_USE_SDL) + sdlMainLoop(); +#endif + return 0; } diff --git a/utils/Modeller/3dconvert.cxx b/utils/Modeller/3dconvert.cxx index db9859e..eacf69c 100644 --- a/utils/Modeller/3dconvert.cxx +++ b/utils/Modeller/3dconvert.cxx @@ -6,7 +6,14 @@ #include <iostream> +#if defined(PU_USE_GLUT) #include SG_GLUT_H +#elif defined(PU_USE_SDL) +#include <SDL/SDL.h> +#include <GL/gl.h> +#else +#error FlightGear is not configured to use either GLUT or SDL +#endif #include <plib/ssg.h> @@ -22,12 +29,19 @@ main (int ac, char ** av) return 1; } +#if defined(PU_USE_GLUT) int fakeac = 1; char * fakeav[] = { "3dconvert", "Convert a 3D Model", 0 }; glutInit(&fakeac, fakeav); glutCreateWindow(fakeav[1]); +#elif defined(PU_USE_SDL) + SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); + atexit(SDL_Quit); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_SetVideoMode(320, 240, 0, SDL_OPENGL); +#endif ssgInit(); ssgEntity * object = ssgLoad(av[1]); ++++++ SimGear-0.3.11-pre1-ppc_detect.patch ++++++ --- simgear/nasal/naref.h +++ simgear/nasal/naref.h @@ -12,7 +12,7 @@ #elif defined(_M_IX86) || defined(i386) || defined(__x86_64) || \ defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) # define NASAL_LE -#elif defined(__sparc) || defined(__ppc__) || defined(__mips) || \ +#elif defined(__SPARC) || defined(__PPC__) || defined(__MIPS) || \ defined(__ARMEB__) # define NASAL_BE #else ++++++ SimGear-0.3.11-pre1-strict_alias.patch ++++++ --- simgear/nasal/hash.c +++ simgear/nasal/hash.c @@ -24,7 +24,7 @@ // Numbers get the number as a hash. Just use the bits and // xor them together. Note assumption that sizeof(double) >= // 2*sizeof(int). - unsigned int* p = (unsigned int*)&(r.num); + unsigned int* p = &(r.num); return p[0] ^ p[1]; } else if(PTR(r).str->hashcode) { return PTR(r).str->hashcode; ++++++ SimGear-0.3.11-pre1-uninitialized.patch ++++++ --- simgear/screen/RenderTexture.cpp +++ simgear/screen/RenderTexture.cpp @@ -622,7 +622,7 @@ _pDisplay = glXGetCurrentDisplay(); GLXContext context = glXGetCurrentContext(); int screen = DefaultScreen(_pDisplay); - XVisualInfo *visInfo; + XVisualInfo *visInfo = NULL; GLXFBConfig *fbConfigs; int nConfigs; --- simgear/sound/openal_test1.cxx +++ simgear/sound/openal_test1.cxx @@ -99,7 +99,7 @@ ALsizei size; ALvoid* data; ALsizei freq; - ALboolean loop; + ALboolean loop = 0; source_pos[0] = 0.0; source_pos[1] = 0.0; source_pos[2] = 0.0; source_vel[0] = 0.0; source_vel[1] = 0.0; source_vel[2] = 0.0; ++++++ simgear.plib-dependencies.patch ++++++ commit d0ea4d5f32f55c15d55e9e60c7b22a3945035cca Author: Pigeon <pigeon@pigeond.net> Date: Tue May 15 21:56:17 2007 +1000 Some dependencies fix with Makefile.am, so that make -j works diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am index d7149cf..f597465 100644 --- a/simgear/io/Makefile.am +++ b/simgear/io/Makefile.am @@ -27,7 +27,7 @@ noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client 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 \ @@ -38,7 +38,7 @@ tcp_server_LDADD = \ 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 \ @@ -49,7 +49,7 @@ tcp_client_LDADD = \ 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 \ @@ -60,7 +60,7 @@ socktest_LDADD = \ 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 \ @@ -69,7 +69,7 @@ lowtest_LDADD = \ 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 \ diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am index 619e283..03aa978 100644 --- a/simgear/magvar/Makefile.am +++ b/simgear/magvar/Makefile.am @@ -13,7 +13,7 @@ noinst_PROGRAMS = testmagvar testmagvar_SOURCES = testmagvar.cxx testmagvar_LDADD = \ - $(top_builddir)/simgear/magvar/libsgmagvar.a \ + libsgmagvar.a \ $(base_LIBS) INCLUDES = -I$(top_srcdir) diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am index 4e9b64e..44221dd 100644 --- a/simgear/misc/Makefile.am +++ b/simgear/misc/Makefile.am @@ -26,7 +26,7 @@ noinst_PROGRAMS = tabbed_value_test swap_test tabbed_value_test_SOURCES = tabbed_values_test.cxx tabbed_value_test_LDADD = \ - $(top_builddir)/simgear/misc/libsgmisc.a \ + libsgmisc.a \ $(top_builddir)/simgear/xml/libsgxml.a \ $(top_builddir)/simgear/debug/libsgdebug.a diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am index 30265b6..f1cf6f9 100644 --- a/simgear/props/Makefile.am +++ b/simgear/props/Makefile.am @@ -16,7 +16,7 @@ noinst_PROGRAMS = props_test props_test_SOURCES = props_test.cxx props_test_LDADD = \ - $(top_builddir)/simgear/props/libsgprops.a \ + libsgprops.a \ $(top_builddir)/simgear/xml/libsgxml.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am index ead62da..d112265 100644 --- a/simgear/route/Makefile.am +++ b/simgear/route/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = waytest routetest waytest_SOURCES = waytest.cxx waytest_LDADD = \ - $(top_builddir)/simgear/route/libsgroute.a \ + libsgroute.a \ $(top_builddir)/simgear/math/libsgmath.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ @@ -25,7 +25,7 @@ waytest_LDADD = \ routetest_SOURCES = routetest.cxx routetest_LDADD = \ - $(top_builddir)/simgear/route/libsgroute.a \ + libsgroute.a \ $(top_builddir)/simgear/math/libsgmath.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(base_LIBS) diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am index 482bba6..11e5a1d 100644 --- a/simgear/screen/Makefile.am +++ b/simgear/screen/Makefile.am @@ -41,7 +41,7 @@ noinst_PROGRAMS = TestRenderTexture TestRenderTexture_SOURCES = TestRenderTexture.cpp TestRenderTexture_LDADD = \ - $(top_builddir)/simgear/screen/libsgscreen.a \ + libsgscreen.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(opengl_LIBS) endif diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am index 17af84e..0cace19 100644 --- a/simgear/serial/Makefile.am +++ b/simgear/serial/Makefile.am @@ -11,7 +11,7 @@ noinst_PROGRAMS = testserial testserial_SOURCES = testserial.cxx testserial_LDADD = \ - $(top_builddir)/simgear/serial/libsgserial.a \ + libsgserial.a \ $(top_builddir)/simgear/debug/libsgdebug.a INCLUDES = -I$(top_srcdir) diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am index 86aeebe..fc7e41f 100644 --- a/simgear/sound/Makefile.am +++ b/simgear/sound/Makefile.am @@ -26,7 +26,7 @@ openal_test1_LDADD = \ $(openal_LIBS) openal_test2_LDADD = \ - $(top_builddir)/simgear/sound/libsgsound.a \ + libsgsound.a \ $(top_builddir)/simgear/debug/libsgdebug.a \ $(top_builddir)/simgear/misc/libsgmisc.a \ $(top_builddir)/simgear/structure/libsgstructure.a \ ++++++ simgear.plib-distclean.patch ++++++ commit 39e75c73bff5712eb1e2e17dd0e55555a709a44e Author: Pigeon <pigeon@pigeond.net> Date: Tue May 15 18:35:27 2007 +1000 simgear/Makefile.am fix diff --git a/simgear/Makefile.am b/simgear/Makefile.am index 97b15b0..61d53f4 100644 --- a/simgear/Makefile.am +++ b/simgear/Makefile.am @@ -34,4 +34,4 @@ SUBDIRS = \ $(SGTHREAD_DIR) \ timing -DIST_SUBDIRS = $(SUBDIRS) compatibility threads +DIST_SUBDIRS = $(SUBDIRS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org