From: <par...@us...> - 2011-01-17 22:00:41
|
Revision: 8063 http://octave.svn.sourceforge.net/octave/?rev=8063&view=rev Author: paramaniac Date: 2011-01-17 22:00:34 +0000 (Mon, 17 Jan 2011) Log Message: ----------- control: Undo Rev 8055. Some tests from test_control.m fail without mac-specific flags, both octave 3.2.4 and 3.3.55. Revision Links: -------------- http://octave.svn.sourceforge.net/octave/?rev=8055&view=rev Modified Paths: -------------- trunk/octave-forge/main/control/devel/makefile_chol.m trunk/octave-forge/main/control/devel/makefile_h2syn.m trunk/octave-forge/main/control/devel/makefile_hankel.m trunk/octave-forge/main/control/devel/makefile_hinfsyn.m trunk/octave-forge/main/control/devel/makefile_lqr.m trunk/octave-forge/main/control/devel/makefile_lyap.m trunk/octave-forge/main/control/devel/makefile_minreal.m trunk/octave-forge/main/control/devel/makefile_norm.m trunk/octave-forge/main/control/devel/makefile_place.m trunk/octave-forge/main/control/devel/makefile_staircase.m trunk/octave-forge/main/control/devel/makefile_zero.m Modified: trunk/octave-forge/main/control/devel/makefile_chol.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_chol.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_chol.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -11,13 +14,15 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile slsb03od.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb03od.cc \ SB03OD.f select.f SB03OU.f SB03OT.f MB04ND.f \ MB04OD.f SB03OR.f SB03OY.f SB04PX.f MB04NY.f \ MB04OY.f SB03OV.f -mkoctfile slsg03bd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsg03bd.cc \ SG03BD.f SG03BV.f SG03BU.f SG03BW.f SG03BX.f \ SG03BY.f MB02UU.f MB02UV.f Modified: trunk/octave-forge/main/control/devel/makefile_h2syn.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_h2syn.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_h2syn.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -11,7 +14,8 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile slsb10hd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb10hd.cc \ SB10HD.f SB10UD.f SB10VD.f SB10WD.f SB02RD.f \ MB01RU.f SB02SD.f MA02ED.f SB02RU.f SB02MR.f \ MB01SD.f SB02MS.f SB02MV.f SB02MW.f MA02AD.f \ @@ -19,7 +23,8 @@ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f -mkoctfile slsb10ed.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb10ed.cc \ SB10ED.f SB10SD.f SB10TD.f SB10PD.f MB01RX.f \ SB02SD.f SB02OD.f MB01RU.f SB02OU.f SB02OV.f \ SB02OW.f MB01RY.f SB02OY.f SB03SX.f SB03SY.f \ Modified: trunk/octave-forge/main/control/devel/makefile_hankel.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_hankel.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_hankel.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -11,7 +14,8 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile slab13ad.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slab13ad.cc \ AB13AD.f TB01ID.f TB01KD.f AB13AX.f MA02DD.f \ MB03UD.f TB01LD.f SB03OU.f MB03QX.f select.f \ SB03OT.f MB03QD.f MB04ND.f MB04OD.f MB03QY.f \ Modified: trunk/octave-forge/main/control/devel/makefile_hinfsyn.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_hinfsyn.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_hinfsyn.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -11,7 +14,8 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile slsb10fd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb10fd.cc \ SB10FD.f SB10PD.f SB10QD.f SB10RD.f SB02RD.f \ MB01RU.f MB01RX.f MA02AD.f SB02SD.f MA02ED.f \ SB02RU.f SB02MR.f MB01SD.f SB02MS.f SB02MV.f \ @@ -19,7 +23,8 @@ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f -mkoctfile slsb10dd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb10dd.cc \ SB10DD.f MB01RU.f MB01RX.f SB02SD.f SB02OD.f \ MA02AD.f SB02OU.f SB02OV.f SB02OW.f MB01RY.f \ SB02OY.f SB03SX.f SB03SY.f MA02ED.f select.f \ Modified: trunk/octave-forge/main/control/devel/makefile_lqr.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_lqr.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_lqr.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -11,11 +14,13 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile slsb02od.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb02od.cc \ SB02OD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ SB02MR.f SB02MV.f -mkoctfile slsg02ad.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsg02ad.cc \ SG02AD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ MB01SD.f MB02VD.f MB02PD.f MA02GD.f Modified: trunk/octave-forge/main/control/devel/makefile_lyap.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_lyap.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_lyap.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -12,21 +15,25 @@ cd (srcdir); ## Lypunov -mkoctfile slsb03md.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb03md.cc \ SB03MD.f select.f SB03MX.f SB03MY.f MB01RD.f \ SB03MV.f SB03MW.f SB04PX.f ## Sylvester -mkoctfile slsb04md.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb04md.cc \ SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f -mkoctfile slsb04qd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb04qd.cc \ SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f ## Generalized Lyapunov -mkoctfile slsg03ad.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsg03ad.cc \ SG03AD.f MB01RW.f MB01RD.f SG03AX.f SG03AY.f \ MB02UU.f MB02UV.f Modified: trunk/octave-forge/main/control/devel/makefile_minreal.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_minreal.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_minreal.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -11,11 +14,13 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile sltb01pd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + sltb01pd.cc \ TB01PD.f TB01XD.f TB01ID.f AB07MD.f TB01UD.f \ MB03OY.f MB01PD.f MB01QD.f -mkoctfile sltg01jd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + sltg01jd.cc \ TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f cd (homedir); \ No newline at end of file Modified: trunk/octave-forge/main/control/devel/makefile_norm.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_norm.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_norm.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -12,14 +15,16 @@ cd (srcdir); ## H-2 norm -mkoctfile slab13bd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slab13bd.cc \ AB13BD.f SB08DD.f SB03OU.f SB01FY.f TB01LD.f \ SB03OT.f MB04ND.f MB04OD.f MB03QX.f select.f \ SB03OR.f MB04OX.f MB03QD.f SB03OY.f MA02AD.f \ MB03QY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f ## L-inf norm -mkoctfile slab13dd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slab13dd.cc \ AB13DD.f MA02AD.f MB01SD.f MB03XD.f TB01ID.f \ TG01AD.f TG01BD.f AB13DX.f MA01AD.f MA02ID.f \ MB03XP.f MB04DD.f MB04QB.f MB04TB.f MB03XU.f \ Modified: trunk/octave-forge/main/control/devel/makefile_place.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_place.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_place.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -11,7 +14,8 @@ srcdir = [develdir, "/../src"]; cd (srcdir); -mkoctfile slsb01bd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slsb01bd.cc \ SB01BD.f MB03QD.f MB03QY.f SB01BX.f SB01BY.f \ select.f Modified: trunk/octave-forge/main/control/devel/makefile_staircase.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_staircase.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_staircase.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -12,15 +15,18 @@ cd (srcdir); ## staircase form using orthogonal transformations -mkoctfile slab01od.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slab01od.cc \ AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f ## controllability staircase form of descriptor state-space models -mkoctfile sltg01hd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + sltg01hd.cc \ TG01HD.f TG01HX.f ## observability staircase form of descriptor state-space models -mkoctfile sltg01id.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + sltg01id.cc \ TG01ID.f TB01XD.f MA02CD.f AB07MD.f TG01HX.f \ MA02BD.f Modified: trunk/octave-forge/main/control/devel/makefile_zero.m =================================================================== --- trunk/octave-forge/main/control/devel/makefile_zero.m 2011-01-17 19:57:02 UTC (rev 8062) +++ trunk/octave-forge/main/control/devel/makefile_zero.m 2011-01-17 22:00:34 UTC (rev 8063) @@ -4,6 +4,9 @@ ## USAGE: * fetch control from Octave-Forge by svn ## * add control/inst, control/src and control/devel to your Octave path ## * run makefile_* +## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts' +## octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option +## breaks other platforms. See MacPorts Ticket #26640. ## ============================================================================== homedir = pwd (); @@ -12,11 +15,13 @@ cd (srcdir); ## transmission zeros of state-space models -mkoctfile slab08nd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slab08nd.cc \ AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f ## transmission zeros of descriptor state-space models -mkoctfile slag08bd.cc \ +mkoctfile "-Wl,-framework" "-Wl,vecLib" \ + slag08bd.cc \ AG08BD.f AG08BY.f TG01AD.f TB01XD.f MA02CD.f \ TG01FD.f MA02BD.f MB03OY.f This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |