Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -13,10 +13,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.278 2000/11/07 16:39:21 peterg +## *** empty log message *** +## ## Revision 1.277 2000/10/17 09:54:07 peterg ## logic rep sorted out ## ## Revision 1.276 2000/10/15 09:30:31 peterg ## *** empty log message *** @@ -1570,10 +1573,17 @@ touch .octaverc else echo Copying .octaverc cp $MTT_LIB/octave/.octaverc . fi + + if [ -f "useful-functions.hh" ]; then + touch useful-functions.hh + else + echo Copying useful-functions.hh + cp $MTT_CC/include/useful-functions.hh . + fi if [ -z "$directory" ]; then Directory='' else Directory=$directory/MTT_work @@ -1700,22 +1710,24 @@ # Cancel implicit rules I don't want %.dvi: %.tex # MTT implicit rules ## .oct files -%.oct: %.cc +%.oct: %.cc $1_def.h $1_sympar.h echo Creating $1_$2.oct; mkoctfile $< ## .cc files -%.cc: %.p - mtt_p2cc $< +#%.cc: %.p +# mtt_p2cc $< +%.cc: %.m + mtt_m2cc.sh $1 $2 cat #Suffix rules ## .m files ##.SUFFIXES : .r .m ##.r.m: $1_$2.r $1.def $1.sympar - mtt_r2m $1 $2 +## mtt_r2m $1 $2 # Generates code to write reduce code $1_ode_write.r: $1_def.m def2write_r $1 $2 @@ -1851,10 +1863,12 @@ #SUMMARY sympar symbolic parameters (r) $1_sympar.r: $1_sympar.txt sympar_txt2r $1 $1_sympar.m: $1_sympar.txt sympar_txt2m $1 +$1_sympar.h: $1_sympar.txt + sympar_txt2h.sh $1 #SUMMARY sympar symbolic parameters (c) # txt to c sympar conversion $1_sympar.c: $1_sympar.txt sympar_txt2c $1 @@ -1861,12 +1875,10 @@ #SUMMARY sympar symbolic parameters (tex) # txt to tex (LaTeX) sympar conversion $1_sympar.tex: $1_sympar.txt sympar_txt2tex $1 - - #SUMMARY logic Dynamic switch logic (tex) #SUMMARY logic Dynamic switch logic (view) $1_logic.tex: $1_logic.txt txt2tex $1 logic txt @@ -2165,10 +2177,11 @@ sh $1_type.sh 'echo cbg_m2fig ' ' ' ' ' | sh #SUMMARY ese elementary system equations (r) #SUMMARY def definitions - system orders etc. (r) #SUMMARY def definitions - system orders etc. (m) +#SUMMARY def definitions - system orders etc. (h) #SUMMARY struc* structure - list of inputs, outputs and states (txt) #SUMMARY struc structure - list of inputs, outputs and states (tex) #SUMMARY struc* structure - list of inputs, outputs and states (view) #Elementary system equations + definitions $Subsystem_ese.r: $1_cbg.m @@ -2183,10 +2196,12 @@ struc_txt2tex $1 $1_struc.m: $1_struc.txt struc_txt2m $1 $1_def.m: $1_def.r def_r2m $1; matlab_tidy $1_def.m; +$1_def.h: $1_def.m + def_m2h.sh $1 #SUMMARY rdae raw differential-algebraic equations (r) #SUMMARY dae differential-algebraic equations (r) #SUMMARY dae* differential-algebraic equations (m) #SUMMARY dae differential-algebraic equations (tex) @@ -2275,15 +2290,15 @@ $1_ode.m: $1_def.r $1_ode.r mtt_r2m $optimise -parameters $1 ode m; # matlab_tidy $1_ode.m $1_odeo.m: $1_def.r $1_odeo.r mtt_r2m $1 odeo m -$1_ode.oct: $1_def.r $1_ode.p $1_sympars.txt - mtt_p2oct $1 ode +#$1_ode.oct: $1_def.r $1_ode.p $1_sympars.txt +# mtt_p2oct $1 ode -$1_odeo.oct: $1_def.r $1_odeo.p $1_sympars.txt - mtt_p2oct $1 odeo +#$1_odeo.oct: $1_def.r $1_odeo.p $1_sympars.txt +# mtt_p2oct $1 odeo $1_odea.m: $1_ode.m touch $1_odea.m #$1_ode.c: $1_def.r $1_ode.r $1_sympar.r $1_sympar.c