Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[9481] trunk/octave-forge/main/control/devel
|
From: <par...@us...> - 2011-12-29 21:16:04
|
Revision: 9481
http://octave.svn.sourceforge.net/octave/?rev=9481&view=rev
Author: paramaniac
Date: 2011-12-29 21:15:57 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
control: update developer makefiles for new linking mode of mkoctfile 3.5.x (for real this time?)
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 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_chol.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -15,12 +15,13 @@
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 -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
-
mkoctfile slsg03bd.cc \
SG03BD.f SG03BV.f SG03BU.f SG03BW.f SG03BX.f \
SG03BY.f MB02UU.f MB02UV.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_conversions.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_conversions.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_conversions.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -16,17 +16,20 @@
TB04BD.f MC01PY.f TB01ID.f TB01ZD.f MC01PD.f \
TB04BX.f MA02AD.f MB02RD.f MB01PD.f MB02SD.f \
MB01QD.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
## descriptor to regular state-space
mkoctfile slsb10jd.cc \
SB10JD.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_h2syn.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_h2syn.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_h2syn.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -18,6 +18,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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
mkoctfile slsb10ed.cc \
@@ -26,6 +27,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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_hankel.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_hankel.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_hankel.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -17,6 +17,7 @@
SB03OT.f MB03QD.f MB04ND.f MB04OD.f MB03QY.f \
SB03OR.f SB03OY.f SB04PX.f MB04NY.f MB04OY.f \
SB03OV.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_hinfsyn.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_hinfsyn.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_hinfsyn.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -18,6 +18,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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
mkoctfile slsb10dd.cc \
@@ -26,6 +27,7 @@
SB02OY.f SB03SX.f SB03SY.f MA02ED.f select.f \
SB03MX.f SB02MR.f SB02MV.f MB01UD.f SB03MV.f \
SB04PX.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_lqr.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_lqr.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_lqr.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -14,11 +14,13 @@
mkoctfile slsb02od.cc \
SB02OD.f SB02OU.f SB02OV.f SB02OW.f SB02OY.f \
SB02MR.f SB02MV.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_lyap.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_lyap.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_lyap.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -15,16 +15,19 @@
mkoctfile slsb03md.cc \
SB03MD.f select.f SB03MX.f SB03MY.f MB01RD.f \
SB03MV.f SB03MW.f SB04PX.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
## Sylvester
mkoctfile slsb04md.cc \
SB04MD.f SB04MU.f SB04MY.f SB04MR.f SB04MW.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
mkoctfile slsb04qd.cc \
SB04QD.f SB04QU.f SB04QY.f SB04MW.f SB04QR.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
@@ -32,6 +35,7 @@
mkoctfile slsg03ad.cc \
SG03AD.f MB01RW.f MB01RD.f SG03AX.f SG03AY.f \
MB02UU.f MB02UV.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_minreal.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_minreal.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_minreal.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -14,10 +14,12 @@
mkoctfile sltb01pd.cc \
TB01PD.f TB01XD.f TB01ID.f AB07MD.f TB01UD.f \
MB03OY.f MB01PD.f MB01QD.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
mkoctfile sltg01jd.cc \
TG01JD.f TG01AD.f TB01XD.f MA02CD.f TG01HX.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_ncfsyn.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_ncfsyn.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_ncfsyn.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -19,20 +19,22 @@
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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_norm.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_norm.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_norm.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -17,6 +17,7 @@
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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
## L-inf norm
@@ -27,6 +28,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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)" \
"$(mkoctfile -p FLIBS)"
Modified: trunk/octave-forge/main/control/devel/makefile_place.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_place.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_place.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -14,6 +14,7 @@
mkoctfile slsb01bd.cc \
SB01BD.f MB03QD.f MB03QY.f SB01BX.f SB01BY.f \
select.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_scale.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_scale.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_scale.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -14,11 +14,13 @@
## scaling of state-space models
mkoctfile sltb01id.cc \
TB01ID.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
## scaling of descriptor state-space models
mkoctfile sltg01ad.cc \
TG01AD.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_staircase.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_staircase.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_staircase.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -14,17 +14,20 @@
## staircase form using orthogonal transformations
mkoctfile slab01od.cc \
AB01OD.f AB01ND.f MB03OY.f MB01PD.f MB01QD.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
## controllability staircase form of descriptor state-space models
mkoctfile sltg01hd.cc \
TG01HD.f TG01HX.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_tustin.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_tustin.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_tustin.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -14,6 +14,7 @@
## bilinear transformation
mkoctfile slab04md.cc \
AB04MD.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
Modified: trunk/octave-forge/main/control/devel/makefile_zero.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_zero.m 2011-12-29 17:43:24 UTC (rev 9480)
+++ trunk/octave-forge/main/control/devel/makefile_zero.m 2011-12-29 21:15:57 UTC (rev 9481)
@@ -14,17 +14,20 @@
## transmission zeros of state-space models
mkoctfile slab08nd.cc \
AB08ND.f AB08NX.f TB01ID.f MB03OY.f MB03PY.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(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 \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
## gain of descriptor state-space models
mkoctfile sltg04bx.cc \
TG04BX.f MB02RD.f MB02SD.f \
+ "$(mkoctfile -p LAPACK_LIBS)" \
"$(mkoctfile -p BLAS_LIBS)"
system ("rm *.o");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
