Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[9479] trunk/octave-forge/main/control/devel
|
From: <par...@us...> - 2011-12-29 17:39:26
|
Revision: 9479
http://octave.svn.sourceforge.net/octave/?rev=9479&view=rev
Author: paramaniac
Date: 2011-12-29 17:39:19 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
control: update developer makefiles for new linking mode of mkoctfile 3.5.x (fingers crossed)
Modified Paths:
--------------
trunk/octave-forge/main/control/devel/makefile_chol.m
trunk/octave-forge/main/control/devel/makefile_conversions.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_ncfsyn.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_scale.m
trunk/octave-forge/main/control/devel/makefile_staircase.m
trunk/octave-forge/main/control/devel/makefile_tustin.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-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_chol.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -14,12 +14,14 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
+
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_conversions.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_conversions.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_conversions.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -15,16 +15,19 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
## descriptor to regular state-space
mkoctfile slsb10jd.cc \
- SB10JD.f
+ SB10JD.f \
+ "$(mkoctfile -p BLAS_LIBS)"
## transfer function to state-space
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_h2syn.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_h2syn.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_h2syn.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -17,14 +17,16 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
mkoctfile 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 \
MA02ED.f select.f SB03MX.f SB02MR.f SB02MV.f \
- MB01UD.f SB03MV.f SB04PX.f
+ MB01UD.f SB03MV.f SB04PX.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_hankel.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_hankel.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_hankel.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -16,7 +16,8 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_hinfsyn.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_hinfsyn.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_hinfsyn.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -17,14 +17,16 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
mkoctfile 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 \
SB03MX.f SB02MR.f SB02MV.f MB01UD.f SB03MV.f \
- SB04PX.f
+ SB04PX.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_lqr.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_lqr.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_lqr.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -13,11 +13,13 @@
mkoctfile slsb02od.cc \
SB02OD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \
- SB02MR.f SB02MV.f
+ SB02MR.f SB02MV.f \
+ "$(mkoctfile -p BLAS_LIBS)"
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_lyap.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_lyap.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_lyap.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -14,21 +14,25 @@
## Lypunov
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
## Sylvester
mkoctfile slsb04md.cc \
- SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f
+ SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f \
+ "$(mkoctfile -p BLAS_LIBS)"
mkoctfile slsb04qd.cc \
- SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f
+ SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f \
+ "$(mkoctfile -p BLAS_LIBS)"
## Generalized Lyapunov
mkoctfile slsg03ad.cc \
SG03AD.f MB01RW.f MB01RD.f SG03AX.f SG03AY.f \
- MB02UU.f MB02UV.f
+ MB02UU.f MB02UV.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_minreal.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_minreal.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_minreal.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -13,10 +13,12 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
mkoctfile sltg01jd.cc \
- TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f
+ TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_ncfsyn.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_ncfsyn.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_ncfsyn.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -18,18 +18,22 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
## H-infinity loop shaping - discrete-time - strictly proper case
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
+
## H-infinity loop shaping - discrete-time - proper case
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_norm.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_norm.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_norm.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -16,7 +16,8 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
## L-inf norm
mkoctfile slab13dd.cc \
@@ -25,7 +26,9 @@
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 \
+ "$(mkoctfile -p BLAS_LIBS)" \
+ "$(mkoctfile -p FLIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_place.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_place.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_place.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -13,7 +13,8 @@
mkoctfile slsb01bd.cc \
SB01BD.f MB03QD.f MB03QY.f SB01BX.f SB01BY.f \
- select.f
+ select.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_scale.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_scale.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_scale.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -13,11 +13,13 @@
## scaling of state-space models
mkoctfile sltb01id.cc \
- TB01ID.f
+ TB01ID.f \
+ "$(mkoctfile -p BLAS_LIBS)"
## scaling of descriptor state-space models
mkoctfile sltg01ad.cc \
- TG01AD.f
+ TG01AD.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_staircase.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_staircase.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_staircase.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -13,16 +13,19 @@
## staircase form using orthogonal transformations
mkoctfile slab01od.cc \
- AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f
+ AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f \
+ "$(mkoctfile -p BLAS_LIBS)"
## controllability staircase form of descriptor state-space models
mkoctfile sltg01hd.cc \
- TG01HD.f TG01HX.f
+ TG01HD.f TG01HX.f \
+ "$(mkoctfile -p BLAS_LIBS)"
## observability staircase form of descriptor state-space models
mkoctfile sltg01id.cc \
TG01ID.f TB01XD.f MA02CD.f AB07MD.f TG01HX.f \
- MA02BD.f
+ MA02BD.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
\ No newline at end of file
Modified: trunk/octave-forge/main/control/devel/makefile_tustin.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_tustin.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_tustin.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -13,7 +13,8 @@
## bilinear transformation
mkoctfile slab04md.cc \
- AB04MD.f
+ AB04MD.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
Modified: trunk/octave-forge/main/control/devel/makefile_zero.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_zero.m 2011-12-29 13:39:07 UTC (rev 9478)
+++ trunk/octave-forge/main/control/devel/makefile_zero.m 2011-12-29 17:39:19 UTC (rev 9479)
@@ -13,16 +13,19 @@
## transmission zeros of state-space models
mkoctfile slab08nd.cc \
- AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f
+ AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f \
+ "$(mkoctfile -p BLAS_LIBS)"
## transmission zeros of descriptor state-space models
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 \
+ "$(mkoctfile -p BLAS_LIBS)"
## gain of descriptor state-space models
mkoctfile sltg04bx.cc \
- TG04BX.f MB02RD.f MB02SD.f
+ TG04BX.f MB02RD.f MB02SD.f \
+ "$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
cd (homedir);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
