Mercurial > forge

changeset 9474:93c0ea2dd0aa octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control: touch up makefiles
author paramaniac
date Wed, 22 Feb 2012 19:21:08 +0000
parents f088f620a46c
children f4cb218d8bea
files main/control/devel/makefile_chol.m main/control/devel/makefile_conversions.m
diffstat 2 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/main/control/devel/makefile_chol.m	Wed Feb 22 19:13:32 2012 +0000
+++ b/main/control/devel/makefile_chol.m	Wed Feb 22 19:21:08 2012 +0000
@@ -12,7 +12,14 @@
 cd (srcdir);
 
 system ("rm -rf *.o slsb03od.oct slsg03bd.oct");
-system ("make slsb03od.oct slsg03bd.oct")
+system ("make slsb03od.oct slsg03bd.oct");
 
 system ("rm -rf *.o");
 cd (homedir);
+
+%{
+system ("rm -rf *.o ");
+system ("make ");
+
+system ("rm -rf *.o");
+%}
\ No newline at end of file
--- a/main/control/devel/makefile_conversions.m	Wed Feb 22 19:13:32 2012 +0000
+++ b/main/control/devel/makefile_conversions.m	Wed Feb 22 19:21:08 2012 +0000
@@ -12,25 +12,13 @@
 cd (srcdir);
 
 ## state-space to transfer function
-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 \
-          "$(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");
+system ("rm -rf *.o sltb04bd.oct slsb10jd.oct sltd04ad.oct");
+system ("make sltb04bd.oct slsb10jd.oct sltd04ad.oct");
+
+system ("rm -rf *.o");
 cd (homedir);