From: <par...@us...> - 2011-01-24 19:22:29
|
Revision: 8071 http://octave.svn.sourceforge.net/octave/?rev=8071&view=rev Author: paramaniac Date: 2011-01-24 19:22:23 +0000 (Mon, 24 Jan 2011) Log Message: ----------- control: remove obsolete TODO Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2011-01-24 17:52:20 UTC (rev 8070) +++ trunk/octave-forge/main/control/src/Makefile 2011-01-24 19:22:23 UTC (rev 8071) @@ -6,7 +6,6 @@ is_real_scalar.oct is_real_vector.oct is_real_matrix.oct \ is_real_square_matrix.oct -# TODO: automatically run "rm makefile_*.m" for installation # TODO: leading and trailing underscores for sl* functions # (__sl*__.oct) would be nice, but this can be an issue # for fortran compilers. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-11-25 20:09:02
|
Revision: 9189 http://octave.svn.sourceforge.net/octave/?rev=9189&view=rev Author: paramaniac Date: 2011-11-25 20:08:56 +0000 (Fri, 25 Nov 2011) Log Message: ----------- control: apply patch from Olaf Till Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2011-11-25 19:59:26 UTC (rev 9188) +++ trunk/octave-forge/main/control/src/Makefile 2011-11-25 20:08:56 UTC (rev 9189) @@ -1,3 +1,5 @@ +OCTAVE ?= octave + all: slab08nd.oct slab13dd.oct slsb10hd.oct slsb10ed.oct slab13bd.oct \ slsb01bd.oct slsb10fd.oct slsb10dd.oct slsb03md.oct slsb04md.oct \ slsb04qd.oct slsg03ad.oct slsb02od.oct slab13ad.oct slab01od.oct \ @@ -6,8 +8,12 @@ sltg01ad.oct slsb10id.oct slsb10kd.oct slsb10zd.oct sltb04bd.oct \ slab04md.oct slsb10jd.oct sltd04ad.oct \ is_real_scalar.oct is_real_vector.oct is_real_matrix.oct \ - is_real_square_matrix.oct + is_real_square_matrix.oct \ + copy_NEWS +copy_NEWS: + $(if $(shell $(OCTAVE) -q --eval "if (compare_versions (version (), \"3.6.0\", \"<\")) printf (\"true\"); endif"), mv ../NEWS ../doc/) + # TODO: leading and trailing underscores for sl* functions # (__sl*__.oct) would be nice, but this can be an issue # for fortran compilers. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-12-28 12:55:54
|
Revision: 9472 http://octave.svn.sourceforge.net/octave/?rev=9472&view=rev Author: paramaniac Date: 2011-12-28 12:55:47 +0000 (Wed, 28 Dec 2011) Log Message: ----------- control: apply Makefile patch from Marco Atzeri Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2011-12-27 20:48:20 UTC (rev 9471) +++ trunk/octave-forge/main/control/src/Makefile 2011-12-28 12:55:47 UTC (rev 9472) @@ -1,5 +1,9 @@ OCTAVE ?= octave +LAPACK_LIBS != mkoctfile -p LAPACK_LIBS +BLAS_LIBS != mkoctfile -p BLAS_LIBS +FLIBS != mkoctfile -p FLIBS + all: slab08nd.oct slab13dd.oct slsb10hd.oct slsb10ed.oct slab13bd.oct \ slsb01bd.oct slsb10fd.oct slsb10dd.oct slsb03md.oct slsb04md.oct \ slsb04qd.oct slsg03ad.oct slsb02od.oct slab13ad.oct slab01od.oct \ @@ -21,7 +25,8 @@ # transmission zeros of state-space models slab08nd.oct: slab08nd.cc mkoctfile slab08nd.cc \ - AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f + AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # L-infinity norm slab13dd.oct: slab13dd.cc @@ -31,7 +36,8 @@ MB03XP.f MB04DD.f MB04QB.f MB04TB.f MB03XU.f \ MB04TS.f UE01MD.f MB02RD.f MB02SD.f MB04QC.f \ MB04QF.f MB03YA.f MB03YD.f MB02RZ.f MB04QU.f \ - MB02SZ.f MB03YT.f + MB02SZ.f MB03YT.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} # H-2 controller synthesis - continuous-time slsb10hd.oct: slsb10hd.cc @@ -41,7 +47,8 @@ MB01SD.f SB02MS.f SB02MV.f SB02MW.f MA02AD.f \ SB02QD.f MB02PD.f SB03QX.f SB03QY.f MB01RX.f \ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ - SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f + SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # H-2 controller synthesis - discrete-time slsb10ed.oct: slsb10ed.cc @@ -50,7 +57,8 @@ SB02SD.f SB02OD.f MB01RU.f SB02OU.f SB02OV.f \ SB02OW.f MB01RY.f SB02OY.f SB03SX.f SB03SY.f \ MA02ED.f select.f SB03MX.f SB02MR.f SB02MV.f \ - MB01UD.f SB03MV.f SB04PX.f + MB01UD.f SB03MV.f SB04PX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # H-2 norm slab13bd.oct: slab13bd.cc @@ -58,13 +66,15 @@ 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 + MB03QY.f SB04PX.f MB04NY.f MB04OY.f SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # Pole assignment slsb01bd.oct: slsb01bd.cc mkoctfile slsb01bd.cc \ SB01BD.f MB03QD.f MB03QY.f SB01BX.f SB01BY.f \ - select.f + select.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # H-inf controller synthesis - continuous-time slsb10fd.oct: slsb10fd.cc @@ -74,7 +84,8 @@ SB02RU.f SB02MR.f MB01SD.f SB02MS.f SB02MV.f \ SB02MW.f SB02QD.f MB02PD.f SB03QX.f SB03QY.f \ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ - SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f + SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # H-inf controller synthesis - discrete-time slsb10dd.oct: slsb10dd.cc @@ -83,35 +94,41 @@ MA02AD.f SB02OU.f SB02OV.f SB02OW.f MB01RY.f \ SB02OY.f SB03SX.f SB03SY.f MA02ED.f select.f \ SB03MX.f SB02MR.f SB02MV.f MB01UD.f SB03MV.f \ - SB04PX.f + SB04PX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # Lyapunov equations slsb03md.oct: slsb03md.cc mkoctfile slsb03md.cc \ SB03MD.f select.f SB03MX.f SB03MY.f MB01RD.f \ - SB03MV.f SB03MW.f SB04PX.f + SB03MV.f SB03MW.f SB04PX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # Sylvester equations - continuous-time slsb04md.oct: slsb04md.cc mkoctfile slsb04md.cc \ - SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f + SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # Sylvester equations - discrete-time slsb04qd.oct: slsb04qd.cc mkoctfile slsb04qd.cc \ - SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f + SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # generalized Lyapunov equations slsg03ad.oct: slsg03ad.cc mkoctfile slsg03ad.cc \ SG03AD.f MB01RW.f MB01RD.f SG03AX.f SG03AY.f \ - MB02UU.f MB02UV.f + MB02UU.f MB02UV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # algebraic Riccati equations slsb02od.oct: slsb02od.cc mkoctfile slsb02od.cc \ SB02OD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ - SB02MR.f SB02MV.f + SB02MR.f SB02MV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # Hankel singular values slab13ad.oct: slab13ad.cc @@ -120,74 +137,87 @@ MB03UD.f TB01LD.f SB03OU.f MB03QX.f select.f \ SB03OT.f MB03QD.f MB04ND.f MB04OD.f MB03QY.f \ SB03OR.f SB03OY.f SB04PX.f MB04NY.f MB04OY.f \ - SB03OV.f + SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # staircase form using orthogonal transformations slab01od.oct: slab01od.cc mkoctfile slab01od.cc \ - AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f + AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # minimal realization of state-space models sltb01pd.oct: sltb01pd.cc mkoctfile sltb01pd.cc \ TB01PD.f TB01XD.f TB01ID.f AB07MD.f TB01UD.f \ - MB03OY.f MB01PD.f MB01QD.f + MB03OY.f MB01PD.f MB01QD.f \ + $(LAPACK_LIBS) $(BLAS_LIBS) # Cholesky factor of Lyapunov equations slsb03od.oct: slsb03od.cc mkoctfile 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 + MB04OY.f SB03OV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # Cholesky factor of generalized Lyapunov equations slsg03bd.oct: slsg03bd.cc mkoctfile slsg03bd.cc \ SG03BD.f SG03BV.f SG03BU.f SG03BW.f SG03BX.f \ - SG03BY.f MB02UU.f MB02UV.f + SG03BY.f MB02UU.f MB02UV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # transmission zeros of descriptor state-space models slag08bd.oct: slag08bd.cc mkoctfile slag08bd.cc \ AG08BD.f AG08BY.f TG01AD.f TB01XD.f MA02CD.f \ - TG01FD.f MA02BD.f MB03OY.f + TG01FD.f MA02BD.f MB03OY.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # minimal realization of descriptor state-space models sltg01jd.oct: sltg01jd.cc mkoctfile sltg01jd.cc \ - TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f + TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # controllability staircase form of descriptor state-space models sltg01hd.oct: sltg01hd.cc mkoctfile sltg01hd.cc \ - TG01HD.f TG01HX.f + TG01HD.f TG01HX.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # observability staircase form of descriptor state-space models sltg01id.oct: sltg01id.cc mkoctfile sltg01id.cc \ TG01ID.f TB01XD.f MA02CD.f AB07MD.f TG01HX.f \ - MA02BD.f + MA02BD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # solution of algebraic Riccati equations for descriptor systems slsg02ad.oct: slsg02ad.cc mkoctfile slsg02ad.cc \ SG02AD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ - MB01SD.f MB02VD.f MB02PD.f MA02GD.f + MB01SD.f MB02VD.f MB02PD.f MA02GD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # gain of descriptor state-space models sltg04bx.oct: sltg04bx.cc mkoctfile sltg04bx.cc \ - TG04BX.f MB02RD.f MB02SD.f + TG04BX.f MB02RD.f MB02SD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # scaling of state-space models sltb01id.oct: sltb01id.cc mkoctfile sltb01id.cc \ - TB01ID.f + TB01ID.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # scaling of descriptor state-space models sltg01ad.oct: sltg01ad.cc mkoctfile sltg01ad.cc \ - TG01AD.f + TG01AD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # H-infinity loop shaping - continuous-time slsb10id.oct: slsb10id.cc @@ -197,43 +227,50 @@ MB01RU.f SB02QD.f SB02MV.f SB02MW.f SB02MR.f \ MA02AD.f MB02PD.f MB01SD.f MB01UD.f SB03SY.f \ MB01RX.f SB03MX.f SB03SX.f MB01RY.f SB03QY.f \ - SB03QX.f SB03MY.f SB04PX.f SB03MV.f SB03MW.f + SB03QX.f SB03MY.f SB04PX.f SB03MV.f SB03MW.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # H-infinity loop shaping - discrete-time - strictly proper case slsb10kd.oct: slsb10kd.cc mkoctfile slsb10kd.cc \ SB10KD.f SB02OD.f select.f SB02OY.f SB02OW.f \ - SB02OV.f SB02MV.f SB02OU.f SB02MR.f + SB02OV.f SB02MV.f SB02OU.f SB02MR.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # H-infinity loop shaping - discrete-time - proper case slsb10zd.oct: slsb10zd.cc mkoctfile slsb10zd.cc \ SB10ZD.f MA02AD.f SB02OD.f select.f MB01RX.f \ MB02VD.f SB02OY.f SB02OW.f SB02OV.f SB02OU.f \ - SB02MR.f MA02GD.f SB02MV.f + SB02MR.f MA02GD.f SB02MV.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # State-space to transfer function conversion sltb04bd.oct: sltb04bd.cc mkoctfile sltb04bd.cc \ TB04BD.f MC01PY.f TB01ID.f TB01ZD.f MC01PD.f \ TB04BX.f MA02AD.f MB02RD.f MB01PD.f MB02SD.f \ - MB01QD.f + MB01QD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # bilinear transformation slab04md.oct: slab04md.cc mkoctfile slab04md.cc \ - AB04MD.f + AB04MD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # descriptor to regular state-space conversion slsb10jd.oct: slsb10jd.cc mkoctfile slsb10jd.cc \ - SB10JD.f + SB10JD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # transfer function to state-space conversion sltd04ad.oct: sltd04ad.cc mkoctfile sltd04ad.cc \ TD04AD.f TD03AY.f TB01PD.f TB01XD.f AB07MD.f \ - TB01UD.f TB01ID.f MB01PD.f MB03OY.f MB01QD.f + TB01UD.f TB01ID.f MB01PD.f MB03OY.f MB01QD.f \ + ${LAPACK_LIBS} ${BLAS_LIBS} # helpers is_real_scalar.oct: is_real_scalar.cc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-12-29 17:43:30
|
Revision: 9480 http://octave.svn.sourceforge.net/octave/?rev=9480&view=rev Author: paramaniac Date: 2011-12-29 17:43:24 +0000 (Thu, 29 Dec 2011) Log Message: ----------- control: update package makefile for new linking mode of mkoctfile 3.5.x (fingers crossed again) Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2011-12-29 17:39:19 UTC (rev 9479) +++ trunk/octave-forge/main/control/src/Makefile 2011-12-29 17:43:24 UTC (rev 9480) @@ -1,6 +1,6 @@ OCTAVE ?= octave -LAPACK_LIBS != mkoctfile -p LAPACK_LIBS +# LAPACK_LIBS != mkoctfile -p LAPACK_LIBS BLAS_LIBS != mkoctfile -p BLAS_LIBS FLIBS != mkoctfile -p FLIBS @@ -26,7 +26,7 @@ slab08nd.oct: slab08nd.cc mkoctfile slab08nd.cc \ AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # L-infinity norm slab13dd.oct: slab13dd.cc @@ -37,7 +37,7 @@ MB04TS.f UE01MD.f MB02RD.f MB02SD.f MB04QC.f \ MB04QF.f MB03YA.f MB03YD.f MB02RZ.f MB04QU.f \ MB02SZ.f MB03YT.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} + ${BLAS_LIBS} ${FLIBS} # H-2 controller synthesis - continuous-time slsb10hd.oct: slsb10hd.cc @@ -48,7 +48,7 @@ SB02QD.f MB02PD.f SB03QX.f SB03QY.f MB01RX.f \ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # H-2 controller synthesis - discrete-time slsb10ed.oct: slsb10ed.cc @@ -58,7 +58,7 @@ SB02OW.f MB01RY.f SB02OY.f SB03SX.f SB03SY.f \ MA02ED.f select.f SB03MX.f SB02MR.f SB02MV.f \ MB01UD.f SB03MV.f SB04PX.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # H-2 norm slab13bd.oct: slab13bd.cc @@ -67,14 +67,14 @@ 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 \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # Pole assignment slsb01bd.oct: slsb01bd.cc mkoctfile slsb01bd.cc \ SB01BD.f MB03QD.f MB03QY.f SB01BX.f SB01BY.f \ select.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # H-inf controller synthesis - continuous-time slsb10fd.oct: slsb10fd.cc @@ -85,7 +85,7 @@ SB02MW.f SB02QD.f MB02PD.f SB03QX.f SB03QY.f \ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # H-inf controller synthesis - discrete-time slsb10dd.oct: slsb10dd.cc @@ -95,40 +95,40 @@ SB02OY.f SB03SX.f SB03SY.f MA02ED.f select.f \ SB03MX.f SB02MR.f SB02MV.f MB01UD.f SB03MV.f \ SB04PX.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # Lyapunov equations slsb03md.oct: slsb03md.cc mkoctfile slsb03md.cc \ SB03MD.f select.f SB03MX.f SB03MY.f MB01RD.f \ SB03MV.f SB03MW.f SB04PX.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # Sylvester equations - continuous-time slsb04md.oct: slsb04md.cc mkoctfile slsb04md.cc \ SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # Sylvester equations - discrete-time slsb04qd.oct: slsb04qd.cc mkoctfile slsb04qd.cc \ SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # generalized Lyapunov equations slsg03ad.oct: slsg03ad.cc mkoctfile slsg03ad.cc \ SG03AD.f MB01RW.f MB01RD.f SG03AX.f SG03AY.f \ MB02UU.f MB02UV.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # algebraic Riccati equations slsb02od.oct: slsb02od.cc mkoctfile slsb02od.cc \ SB02OD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ SB02MR.f SB02MV.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # Hankel singular values slab13ad.oct: slab13ad.cc @@ -138,13 +138,13 @@ SB03OT.f MB03QD.f MB04ND.f MB04OD.f MB03QY.f \ SB03OR.f SB03OY.f SB04PX.f MB04NY.f MB04OY.f \ SB03OV.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # staircase form using orthogonal transformations slab01od.oct: slab01od.cc mkoctfile slab01od.cc \ AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # minimal realization of state-space models sltb01pd.oct: sltb01pd.cc @@ -159,65 +159,65 @@ SB03OD.f select.f SB03OU.f SB03OT.f MB04ND.f \ MB04OD.f SB03OR.f SB03OY.f SB04PX.f MB04NY.f \ MB04OY.f SB03OV.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # Cholesky factor of generalized Lyapunov equations slsg03bd.oct: slsg03bd.cc mkoctfile slsg03bd.cc \ SG03BD.f SG03BV.f SG03BU.f SG03BW.f SG03BX.f \ SG03BY.f MB02UU.f MB02UV.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # transmission zeros of descriptor state-space models slag08bd.oct: slag08bd.cc mkoctfile slag08bd.cc \ AG08BD.f AG08BY.f TG01AD.f TB01XD.f MA02CD.f \ TG01FD.f MA02BD.f MB03OY.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # minimal realization of descriptor state-space models sltg01jd.oct: sltg01jd.cc mkoctfile sltg01jd.cc \ TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # controllability staircase form of descriptor state-space models sltg01hd.oct: sltg01hd.cc mkoctfile sltg01hd.cc \ TG01HD.f TG01HX.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # observability staircase form of descriptor state-space models sltg01id.oct: sltg01id.cc mkoctfile sltg01id.cc \ TG01ID.f TB01XD.f MA02CD.f AB07MD.f TG01HX.f \ MA02BD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # solution of algebraic Riccati equations for descriptor systems slsg02ad.oct: slsg02ad.cc mkoctfile slsg02ad.cc \ SG02AD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ MB01SD.f MB02VD.f MB02PD.f MA02GD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # gain of descriptor state-space models sltg04bx.oct: sltg04bx.cc mkoctfile sltg04bx.cc \ TG04BX.f MB02RD.f MB02SD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # scaling of state-space models sltb01id.oct: sltb01id.cc mkoctfile sltb01id.cc \ TB01ID.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # scaling of descriptor state-space models sltg01ad.oct: sltg01ad.cc mkoctfile sltg01ad.cc \ TG01AD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # H-infinity loop shaping - continuous-time slsb10id.oct: slsb10id.cc @@ -228,14 +228,14 @@ MA02AD.f MB02PD.f MB01SD.f MB01UD.f SB03SY.f \ MB01RX.f SB03MX.f SB03SX.f MB01RY.f SB03QY.f \ SB03QX.f SB03MY.f SB04PX.f SB03MV.f SB03MW.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # H-infinity loop shaping - discrete-time - strictly proper case slsb10kd.oct: slsb10kd.cc mkoctfile slsb10kd.cc \ SB10KD.f SB02OD.f select.f SB02OY.f SB02OW.f \ SB02OV.f SB02MV.f SB02OU.f SB02MR.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # H-infinity loop shaping - discrete-time - proper case slsb10zd.oct: slsb10zd.cc @@ -243,7 +243,7 @@ SB10ZD.f MA02AD.f SB02OD.f select.f MB01RX.f \ MB02VD.f SB02OY.f SB02OW.f SB02OV.f SB02OU.f \ SB02MR.f MA02GD.f SB02MV.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # State-space to transfer function conversion sltb04bd.oct: sltb04bd.cc @@ -251,26 +251,26 @@ TB04BD.f MC01PY.f TB01ID.f TB01ZD.f MC01PD.f \ TB04BX.f MA02AD.f MB02RD.f MB01PD.f MB02SD.f \ MB01QD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # bilinear transformation slab04md.oct: slab04md.cc mkoctfile slab04md.cc \ AB04MD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # descriptor to regular state-space conversion slsb10jd.oct: slsb10jd.cc mkoctfile slsb10jd.cc \ SB10JD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # transfer function to state-space conversion sltd04ad.oct: sltd04ad.cc mkoctfile sltd04ad.cc \ TD04AD.f TD03AY.f TB01PD.f TB01XD.f AB07MD.f \ TB01UD.f TB01ID.f MB01PD.f MB03OY.f MB01QD.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} + ${BLAS_LIBS} # helpers is_real_scalar.oct: is_real_scalar.cc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-12-29 21:18:26
|
Revision: 9482 http://octave.svn.sourceforge.net/octave/?rev=9482&view=rev Author: paramaniac Date: 2011-12-29 21:18:20 +0000 (Thu, 29 Dec 2011) Log Message: ----------- control: return to Marco Atzeri's original patch Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2011-12-29 21:15:57 UTC (rev 9481) +++ trunk/octave-forge/main/control/src/Makefile 2011-12-29 21:18:20 UTC (rev 9482) @@ -1,6 +1,6 @@ OCTAVE ?= octave -# LAPACK_LIBS != mkoctfile -p LAPACK_LIBS +LAPACK_LIBS != mkoctfile -p LAPACK_LIBS BLAS_LIBS != mkoctfile -p BLAS_LIBS FLIBS != mkoctfile -p FLIBS @@ -26,7 +26,7 @@ slab08nd.oct: slab08nd.cc mkoctfile slab08nd.cc \ AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # L-infinity norm slab13dd.oct: slab13dd.cc @@ -37,7 +37,7 @@ MB04TS.f UE01MD.f MB02RD.f MB02SD.f MB04QC.f \ MB04QF.f MB03YA.f MB03YD.f MB02RZ.f MB04QU.f \ MB02SZ.f MB03YT.f \ - ${BLAS_LIBS} ${FLIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} # H-2 controller synthesis - continuous-time slsb10hd.oct: slsb10hd.cc @@ -48,7 +48,7 @@ SB02QD.f MB02PD.f SB03QX.f SB03QY.f MB01RX.f \ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # H-2 controller synthesis - discrete-time slsb10ed.oct: slsb10ed.cc @@ -58,7 +58,7 @@ SB02OW.f MB01RY.f SB02OY.f SB03SX.f SB03SY.f \ MA02ED.f select.f SB03MX.f SB02MR.f SB02MV.f \ MB01UD.f SB03MV.f SB04PX.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # H-2 norm slab13bd.oct: slab13bd.cc @@ -67,14 +67,14 @@ 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 \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # Pole assignment slsb01bd.oct: slsb01bd.cc mkoctfile slsb01bd.cc \ SB01BD.f MB03QD.f MB03QY.f SB01BX.f SB01BY.f \ select.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # H-inf controller synthesis - continuous-time slsb10fd.oct: slsb10fd.cc @@ -85,7 +85,7 @@ SB02MW.f SB02QD.f MB02PD.f SB03QX.f SB03QY.f \ MB01RY.f SB03SX.f SB03SY.f select.f SB03MX.f \ SB03MY.f MB01UD.f SB03MV.f SB03MW.f SB04PX.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # H-inf controller synthesis - discrete-time slsb10dd.oct: slsb10dd.cc @@ -95,40 +95,40 @@ SB02OY.f SB03SX.f SB03SY.f MA02ED.f select.f \ SB03MX.f SB02MR.f SB02MV.f MB01UD.f SB03MV.f \ SB04PX.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # Lyapunov equations slsb03md.oct: slsb03md.cc mkoctfile slsb03md.cc \ SB03MD.f select.f SB03MX.f SB03MY.f MB01RD.f \ SB03MV.f SB03MW.f SB04PX.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # Sylvester equations - continuous-time slsb04md.oct: slsb04md.cc mkoctfile slsb04md.cc \ SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # Sylvester equations - discrete-time slsb04qd.oct: slsb04qd.cc mkoctfile slsb04qd.cc \ SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # generalized Lyapunov equations slsg03ad.oct: slsg03ad.cc mkoctfile slsg03ad.cc \ SG03AD.f MB01RW.f MB01RD.f SG03AX.f SG03AY.f \ MB02UU.f MB02UV.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # algebraic Riccati equations slsb02od.oct: slsb02od.cc mkoctfile slsb02od.cc \ SB02OD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ SB02MR.f SB02MV.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # Hankel singular values slab13ad.oct: slab13ad.cc @@ -138,13 +138,13 @@ SB03OT.f MB03QD.f MB04ND.f MB04OD.f MB03QY.f \ SB03OR.f SB03OY.f SB04PX.f MB04NY.f MB04OY.f \ SB03OV.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # staircase form using orthogonal transformations slab01od.oct: slab01od.cc mkoctfile slab01od.cc \ AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # minimal realization of state-space models sltb01pd.oct: sltb01pd.cc @@ -159,65 +159,65 @@ SB03OD.f select.f SB03OU.f SB03OT.f MB04ND.f \ MB04OD.f SB03OR.f SB03OY.f SB04PX.f MB04NY.f \ MB04OY.f SB03OV.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # Cholesky factor of generalized Lyapunov equations slsg03bd.oct: slsg03bd.cc mkoctfile slsg03bd.cc \ SG03BD.f SG03BV.f SG03BU.f SG03BW.f SG03BX.f \ SG03BY.f MB02UU.f MB02UV.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # transmission zeros of descriptor state-space models slag08bd.oct: slag08bd.cc mkoctfile slag08bd.cc \ AG08BD.f AG08BY.f TG01AD.f TB01XD.f MA02CD.f \ TG01FD.f MA02BD.f MB03OY.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # minimal realization of descriptor state-space models sltg01jd.oct: sltg01jd.cc mkoctfile sltg01jd.cc \ TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # controllability staircase form of descriptor state-space models sltg01hd.oct: sltg01hd.cc mkoctfile sltg01hd.cc \ TG01HD.f TG01HX.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # observability staircase form of descriptor state-space models sltg01id.oct: sltg01id.cc mkoctfile sltg01id.cc \ TG01ID.f TB01XD.f MA02CD.f AB07MD.f TG01HX.f \ MA02BD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # solution of algebraic Riccati equations for descriptor systems slsg02ad.oct: slsg02ad.cc mkoctfile slsg02ad.cc \ SG02AD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \ MB01SD.f MB02VD.f MB02PD.f MA02GD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # gain of descriptor state-space models sltg04bx.oct: sltg04bx.cc mkoctfile sltg04bx.cc \ TG04BX.f MB02RD.f MB02SD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # scaling of state-space models sltb01id.oct: sltb01id.cc mkoctfile sltb01id.cc \ TB01ID.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # scaling of descriptor state-space models sltg01ad.oct: sltg01ad.cc mkoctfile sltg01ad.cc \ TG01AD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # H-infinity loop shaping - continuous-time slsb10id.oct: slsb10id.cc @@ -228,14 +228,14 @@ MA02AD.f MB02PD.f MB01SD.f MB01UD.f SB03SY.f \ MB01RX.f SB03MX.f SB03SX.f MB01RY.f SB03QY.f \ SB03QX.f SB03MY.f SB04PX.f SB03MV.f SB03MW.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # H-infinity loop shaping - discrete-time - strictly proper case slsb10kd.oct: slsb10kd.cc mkoctfile slsb10kd.cc \ SB10KD.f SB02OD.f select.f SB02OY.f SB02OW.f \ SB02OV.f SB02MV.f SB02OU.f SB02MR.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # H-infinity loop shaping - discrete-time - proper case slsb10zd.oct: slsb10zd.cc @@ -243,7 +243,7 @@ SB10ZD.f MA02AD.f SB02OD.f select.f MB01RX.f \ MB02VD.f SB02OY.f SB02OW.f SB02OV.f SB02OU.f \ SB02MR.f MA02GD.f SB02MV.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # State-space to transfer function conversion sltb04bd.oct: sltb04bd.cc @@ -251,26 +251,26 @@ TB04BD.f MC01PY.f TB01ID.f TB01ZD.f MC01PD.f \ TB04BX.f MA02AD.f MB02RD.f MB01PD.f MB02SD.f \ MB01QD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # bilinear transformation slab04md.oct: slab04md.cc mkoctfile slab04md.cc \ AB04MD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # descriptor to regular state-space conversion slsb10jd.oct: slsb10jd.cc mkoctfile slsb10jd.cc \ SB10JD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # transfer function to state-space conversion sltd04ad.oct: sltd04ad.cc mkoctfile sltd04ad.cc \ TD04AD.f TD03AY.f TB01PD.f TB01XD.f AB07MD.f \ TB01UD.f TB01ID.f MB01PD.f MB03OY.f MB01QD.f \ - ${BLAS_LIBS} + ${LAPACK_LIBS} ${BLAS_LIBS} # helpers is_real_scalar.oct: is_real_scalar.cc @@ -286,4 +286,4 @@ mkoctfile is_real_square_matrix.cc clean: - rm *.o core octave-core *.oct *~ + rm *.o core octave-core *.oct *~ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2011-12-29 22:22:24
|
Revision: 9483 http://octave.svn.sourceforge.net/octave/?rev=9483&view=rev Author: paramaniac Date: 2011-12-29 22:22:18 +0000 (Thu, 29 Dec 2011) Log Message: ----------- control: apply Carlo De Falco's patch Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2011-12-29 21:18:20 UTC (rev 9482) +++ trunk/octave-forge/main/control/src/Makefile 2011-12-29 22:22:18 UTC (rev 9483) @@ -1,8 +1,8 @@ OCTAVE ?= octave -LAPACK_LIBS != mkoctfile -p LAPACK_LIBS -BLAS_LIBS != mkoctfile -p BLAS_LIBS -FLIBS != mkoctfile -p FLIBS +LAPACK_LIBS = $$(mkoctfile -p LAPACK_LIBS) +BLAS_LIBS = $$(mkoctfile -p BLAS_LIBS) +FLIBS = $$(mkoctfile -p FLIBS) all: slab08nd.oct slab13dd.oct slsb10hd.oct slsb10ed.oct slab13bd.oct \ slsb01bd.oct slsb10fd.oct slsb10dd.oct slsb03md.oct slsb04md.oct \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-01-10 15:31:07
|
Revision: 9513 http://octave.svn.sourceforge.net/octave/?rev=9513&view=rev Author: paramaniac Date: 2012-01-10 15:30:58 +0000 (Tue, 10 Jan 2012) Log Message: ----------- control: add remark Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-01-10 14:13:39 UTC (rev 9512) +++ trunk/octave-forge/main/control/src/Makefile 2012-01-10 15:30:58 UTC (rev 9513) @@ -18,9 +18,10 @@ copy_NEWS: $(if $(shell $(OCTAVE) -q --eval "if (compare_versions (version (), \"3.6.0\", \"<\")) printf (\"true\"); endif"), mv ../NEWS ../doc/) -# TODO: leading and trailing underscores for sl* functions +# TODO: Leading and trailing underscores for sl* functions # (__sl*__.oct) would be nice, but this can be an issue -# for fortran compilers. +# for fortran compilers. Private oct-files for the +# control package would be even better. # transmission zeros of state-space models slab08nd.oct: slab08nd.cc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-02-15 10:20:46
|
Revision: 9624 http://octave.svn.sourceforge.net/octave/?rev=9624&view=rev Author: paramaniac Date: 2012-02-15 10:20:36 +0000 (Wed, 15 Feb 2012) Log Message: ----------- control: makefile style fix Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-02-15 10:17:12 UTC (rev 9623) +++ trunk/octave-forge/main/control/src/Makefile 2012-02-15 10:20:36 UTC (rev 9624) @@ -1,8 +1,8 @@ OCTAVE ?= octave -LAPACK_LIBS = $$(mkoctfile -p LAPACK_LIBS) -BLAS_LIBS = $$(mkoctfile -p BLAS_LIBS) -FLIBS = $$(mkoctfile -p FLIBS) +LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS) +BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS) +FLIBS := $(shell mkoctfile -p FLIBS) all: slab08nd.oct slab13dd.oct slsb10hd.oct slsb10ed.oct slab13bd.oct \ slsb01bd.oct slsb10fd.oct slsb10dd.oct slsb03md.oct slsb04md.oct \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-02-22 19:13:39
|
Revision: 9659 http://octave.svn.sourceforge.net/octave/?rev=9659&view=rev Author: paramaniac Date: 2012-02-22 19:13:32 +0000 (Wed, 22 Feb 2012) Log Message: ----------- control: avoid problem with parallel make Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-02-22 19:13:10 UTC (rev 9658) +++ trunk/octave-forge/main/control/src/Makefile 2012-02-22 19:13:32 UTC (rev 9659) @@ -31,7 +31,7 @@ mkoctfile *.f \ ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} ar -r slicotlibrary.a *.o - rm -rf *.o *.f *.oct slicot + rm -rf *.o *.f AB01MD.oct slicot # transmission zeros of state-space models slab08nd.oct: slab08nd.cc slicotlibrary.a @@ -220,4 +220,4 @@ rm -rf *.o core octave-core *.oct *~ *.f slicot realclean: clean - rm -rf *.a + rm -rf *.a \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-02-26 08:16:28
|
Revision: 9687 http://octave.svn.sourceforge.net/octave/?rev=9687&view=rev Author: paramaniac Date: 2012-02-26 08:16:22 +0000 (Sun, 26 Feb 2012) Log Message: ----------- control: touch up makefile Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-02-25 23:31:57 UTC (rev 9686) +++ trunk/octave-forge/main/control/src/Makefile 2012-02-26 08:16:22 UTC (rev 9687) @@ -30,10 +30,10 @@ mv slicot/src/*.f . mv slicot/src_aux/*.f . cp TG04BX.fortran TG04BX.f - mkoctfile *.f \ + mkoctfile -c *.f \ ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} ar -r slicotlibrary.a *.o - rm -rf *.o *.f AB01MD.oct slicot + rm -rf *.o *.f slicot # transmission zeros of state-space models slab08nd.oct: slab08nd.cc slicotlibrary.a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-02-26 08:19:55
|
Revision: 9688 http://octave.svn.sourceforge.net/octave/?rev=9688&view=rev Author: paramaniac Date: 2012-02-26 08:19:49 +0000 (Sun, 26 Feb 2012) Log Message: ----------- control: touch up makefile (2) Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-02-26 08:16:22 UTC (rev 9687) +++ trunk/octave-forge/main/control/src/Makefile 2012-02-26 08:19:49 UTC (rev 9688) @@ -30,8 +30,7 @@ mv slicot/src/*.f . mv slicot/src_aux/*.f . cp TG04BX.fortran TG04BX.f - mkoctfile -c *.f \ - ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} + mkoctfile -c *.f ar -r slicotlibrary.a *.o rm -rf *.o *.f slicot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-02-26 08:39:07
|
Revision: 9689 http://octave.svn.sourceforge.net/octave/?rev=9689&view=rev Author: paramaniac Date: 2012-02-26 08:39:01 +0000 (Sun, 26 Feb 2012) Log Message: ----------- control: add comments to makefile Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-02-26 08:19:49 UTC (rev 9688) +++ trunk/octave-forge/main/control/src/Makefile 2012-02-26 08:39:01 UTC (rev 9689) @@ -25,6 +25,13 @@ # for fortran compilers. Private oct-files for the # control package would be even better. +# TODO: Create a single oct-file control_slicot.oct + +# unpack and compile SLICOT library +# Note that TG04BX is a custom routine. +# It has the extension .fortran such that +# it is not deleted by rm *.f when using +# the developer makefile makefile_control.m slicotlibrary.a: slicot.tar.gz tar -xzf slicot.tar.gz mv slicot/src/*.f . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-02-26 12:08:37
|
Revision: 9697 http://octave.svn.sourceforge.net/octave/?rev=9697&view=rev Author: paramaniac Date: 2012-02-26 12:08:31 +0000 (Sun, 26 Feb 2012) Log Message: ----------- control: clean up makefile Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-02-26 11:07:45 UTC (rev 9696) +++ trunk/octave-forge/main/control/src/Makefile 2012-02-26 12:08:31 UTC (rev 9697) @@ -5,20 +5,13 @@ FLIBS := $(shell mkoctfile -p FLIBS) all: control_slicot_functions.oct \ - is_real_scalar.oct is_real_vector.oct is_real_matrix.oct \ - is_real_square_matrix.oct \ - copy_NEWS + is_real_scalar.oct \ + is_real_vector.oct \ + is_real_matrix.oct \ + is_real_square_matrix.oct -copy_NEWS: - $(if $(shell $(OCTAVE) -q --eval "if (compare_versions (version (), \"3.6.0\", \"<\")) printf (\"true\"); endif"), mv ../NEWS ../doc/) +# TODO: Private oct-files for control package. -# TODO: Leading and trailing underscores for sl* functions -# (__sl*__.oct) would be nice, but this can be an issue -# for fortran compilers. Private oct-files for the -# control package would be even better. - -# TODO: Create a single oct-file control_slicot.oct - # unpack and compile SLICOT library # Note that TG04BX is a custom routine. # It has the extension .fortran such that This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-02-29 10:07:02
|
Revision: 9721 http://octave.svn.sourceforge.net/octave/?rev=9721&view=rev Author: paramaniac Date: 2012-02-29 10:06:52 +0000 (Wed, 29 Feb 2012) Log Message: ----------- control: remove cruft Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-02-28 15:45:12 UTC (rev 9720) +++ trunk/octave-forge/main/control/src/Makefile 2012-02-29 10:06:52 UTC (rev 9721) @@ -1,5 +1,3 @@ -OCTAVE ?= octave - LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS) BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS) FLIBS := $(shell mkoctfile -p FLIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-04-06 07:44:43
|
Revision: 10163 http://octave.svn.sourceforge.net/octave/?rev=10163&view=rev Author: paramaniac Date: 2012-04-06 07:44:33 +0000 (Fri, 06 Apr 2012) Log Message: ----------- control: create ar archive slicotlibrary.a silently (-c option) Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-04-06 07:26:18 UTC (rev 10162) +++ trunk/octave-forge/main/control/src/Makefile 2012-04-06 07:44:33 UTC (rev 10163) @@ -21,7 +21,7 @@ mv slicot/src_aux/*.f . cp TG04BX.fortran TG04BX.f mkoctfile -c *.f - ar -r slicotlibrary.a *.o + ar -rc slicotlibrary.a *.o rm -rf *.o *.f slicot # slicot functions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-05-29 15:51:16
|
Revision: 10532 http://octave.svn.sourceforge.net/octave/?rev=10532&view=rev Author: paramaniac Date: 2012-05-29 15:51:05 +0000 (Tue, 29 May 2012) Log Message: ----------- control: apply makefile patch by Olaf Till, add some remarks about temporary nature of the included reference lapack distribution Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-05-28 11:31:45 UTC (rev 10531) +++ trunk/octave-forge/main/control/src/Makefile 2012-05-29 15:51:05 UTC (rev 10532) @@ -1,7 +1,9 @@ -# LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS) -# BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS) -FLIBS := $(shell mkoctfile -p FLIBS) +MKOCTFILE ?= mkoctfile +# LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) +# BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +FLIBS := $(shell $(MKOCTFILE) -p FLIBS) + all: control_slicot_functions.oct \ is_real_scalar.oct \ is_real_vector.oct \ @@ -20,36 +22,42 @@ mv slicot/src/*.f . mv slicot/src_aux/*.f . cp TG04BX.fortran TG04BX.f - mkoctfile -c *.f + $(MKOCTFILE) -c *.f ar -rc slicotlibrary.a *.o rm -rf *.o *.f slicot +# reference lapack is just included for debugging purposes +# it will be removed again before an official release of the control package lapacklibrary.a: lapack-3.4.1.tgz tar -xzf lapack-3.4.1.tgz mv lapack-3.4.1/BLAS/SRC/*.f . mv lapack-3.4.1/INSTALL/*.f . mv lapack-3.4.1/SRC/*.f . - mkoctfile -c *.f + $(MKOCTFILE) -c *.f ar -rc lapacklibrary.a *.o rm -rf *.o *.f lapack-3.4.1 # slicot functions control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a lapacklibrary.a - mkoctfile control_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \ + $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \ ${FLIBS} +# slicot functions +#control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a +# $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a \ +# ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} # helpers is_real_scalar.oct: is_real_scalar.cc - mkoctfile is_real_scalar.cc + $(MKOCTFILE) is_real_scalar.cc is_real_vector.oct: is_real_vector.cc - mkoctfile is_real_vector.cc + $(MKOCTFILE) is_real_vector.cc is_real_matrix.oct: is_real_matrix.cc - mkoctfile is_real_matrix.cc + $(MKOCTFILE) is_real_matrix.cc is_real_square_matrix.oct: is_real_square_matrix.cc - mkoctfile is_real_square_matrix.cc + $(MKOCTFILE) is_real_square_matrix.cc clean: rm -rf *.o core octave-core *.oct *~ *.f slicot lapack-3.4.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-06-07 11:55:32
|
Revision: 10579 http://octave.svn.sourceforge.net/octave/?rev=10579&view=rev Author: paramaniac Date: 2012-06-07 11:55:26 +0000 (Thu, 07 Jun 2012) Log Message: ----------- control: apply Makefile patch by Olaf Till Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-06-07 11:48:22 UTC (rev 10578) +++ trunk/octave-forge/main/control/src/Makefile 2012-06-07 11:55:26 UTC (rev 10579) @@ -3,6 +3,7 @@ LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) FLIBS := $(shell $(MKOCTFILE) -p FLIBS) +LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) all: control_slicot_functions.oct \ is_real_scalar.oct \ @@ -28,8 +29,8 @@ # slicot functions control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a - $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a \ - ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS} + LFLAGS="$(LFLAGS)" \ + $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a # helpers is_real_scalar.oct: is_real_scalar.cc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-06-07 12:01:56
|
Revision: 10580 http://octave.svn.sourceforge.net/octave/?rev=10580&view=rev Author: paramaniac Date: 2012-06-07 12:01:46 +0000 (Thu, 07 Jun 2012) Log Message: ----------- control: apply improved Makefile patch by Olaf Till Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-06-07 11:55:26 UTC (rev 10579) +++ trunk/octave-forge/main/control/src/Makefile 2012-06-07 12:01:46 UTC (rev 10580) @@ -1,8 +1,8 @@ MKOCTFILE ?= mkoctfile -LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) -BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) -FLIBS := $(shell $(MKOCTFILE) -p FLIBS) +LAPACK_LIBS ?= $(shell $(MKOCTFILE) -p LAPACK_LIBS) +BLAS_LIBS ?= $(shell $(MKOCTFILE) -p BLAS_LIBS) +FLIBS ?= $(shell $(MKOCTFILE) -p FLIBS) LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) all: control_slicot_functions.oct \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-06-07 16:58:25
|
Revision: 10586 http://octave.svn.sourceforge.net/octave/?rev=10586&view=rev Author: paramaniac Date: 2012-06-07 16:58:19 +0000 (Thu, 07 Jun 2012) Log Message: ----------- control: further improvements for Makefile by Olaf Till Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-06-07 16:36:19 UTC (rev 10585) +++ trunk/octave-forge/main/control/src/Makefile 2012-06-07 16:58:19 UTC (rev 10586) @@ -1,8 +1,14 @@ MKOCTFILE ?= mkoctfile -LAPACK_LIBS ?= $(shell $(MKOCTFILE) -p LAPACK_LIBS) -BLAS_LIBS ?= $(shell $(MKOCTFILE) -p BLAS_LIBS) -FLIBS ?= $(shell $(MKOCTFILE) -p FLIBS) +ifndef LAPACK_LIBS +LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) +endif +ifndef BLAS_LIBS +BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +endif +ifndef FLIBS +FLIBS := $(shell $(MKOCTFILE) -p FLIBS) +endif LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) all: control_slicot_functions.oct \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <par...@us...> - 2012-08-14 20:33:25
|
Revision: 10872 http://octave.svn.sourceforge.net/octave/?rev=10872&view=rev Author: paramaniac Date: 2012-08-14 20:33:19 +0000 (Tue, 14 Aug 2012) Log Message: ----------- control: fix makefile Modified Paths: -------------- trunk/octave-forge/main/control/src/Makefile Modified: trunk/octave-forge/main/control/src/Makefile =================================================================== --- trunk/octave-forge/main/control/src/Makefile 2012-08-14 20:33:09 UTC (rev 10871) +++ trunk/octave-forge/main/control/src/Makefile 2012-08-14 20:33:19 UTC (rev 10872) @@ -52,6 +52,9 @@ is_real_square_matrix.oct: is_real_square_matrix.cc $(MKOCTFILE) is_real_square_matrix.cc +is_matrix.oct: is_matrix.cc + $(MKOCTFILE) is_matrix.cc + clean: rm -rf *.o core octave-core *.oct *~ *.f slicot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |