Mercurial > hg > octave-lyh

changeset 3735:cf69dbe17e59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-11-04 05:29:09 by jwe]
author jwe
date Sat, 04 Nov 2000 05:29:09 +0000
parents 40574699e4ec
children ac4609ffc702
files ChangeLog mkoctfile.in src/DLD-FUNCTIONS/rand.cc
diffstat 3 files changed, 16 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-03  Andy Adler  <en254@freenet.carleton.ca>
+
+	* mkoctfile.in: Handle -c to mean compile only.
+
 2000-11-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* mkoctfile.in: Handle --print.
--- a/mkoctfile.in
+++ b/mkoctfile.in
@@ -48,6 +48,7 @@
 ldflags=
 dbg=:
 strip=false
+link=true
 
 if [ $# -eq 0 ]; then
   echo $usage_msg
@@ -92,6 +93,8 @@
 
   -LDIR                   Add -LDIR to link command.
 
+  -c                      Compile, but do not link.
+
   -o FILE, --output FILE  Output file name.  Default extension is .oct.
 
   -p VAR, --print VAR     Print configuration variable VAR.  Recognized
@@ -153,6 +156,9 @@
     -s | --strip)
       strip=true
     ;;
+    -c)
+      link=false
+    ;;
     *)
       echo "mkoctfile: unrecognized argument $1"
       exit 1
@@ -231,8 +237,9 @@
 
 # Link all the object files.
 
-$dbg $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
-eval $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
+if $link; then
+  $dbg $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
+  eval $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
 
 # Maybe strip it.
 
@@ -240,5 +247,6 @@
   $dbg strip $octfile
   eval strip $octfile
 fi
+fi
 
 exit 0
--- a/src/DLD-FUNCTIONS/rand.cc
+++ b/src/DLD-FUNCTIONS/rand.cc
@@ -295,13 +295,10 @@
     }
   else if (n > 0 && m > 0)
     {
-      volatile int i;
-      volatile int j;
-
       Matrix rand_mat (n, m);
 
-      for (j = 0; j < m; j++)
-	for (i = 0; i < n; i++)
+      for (volatile int j = 0; j < m; j++)
+	for (volatile i = 0; i < n; i++)
 	  {
 	    double val;
 	    switch (current_distribution)