Revision 1626 trunk/scripts/admb/admb

admb (revision 1626)
172 172
  rm -vf tfile1 tfile2 tfile3 tfile4 tfile5
173 173
  rm -f $model.cpp $model.htp $model.obj $model.o $model
174 174

  
175
  #CMD="$parser $debug $dll $model"
176
  CMD="$parser $dll $model"
175
  CMD="$parser $debug $dll $model"
177 176
  echo -e \\n\*\*\* Parse tpl: $model.tpl\\n$CMD
178 177
  eval $CMD
179 178

  
......
193 192
  fi
194 193

  
195 194
  fileobj=${file%.*}.obj
196
  CMD="$CXX -c $CXXFLAGS -o $fileobj $file"
195
  CMD="$CXX -c $CXXFLAGS -o$fileobj $file"
197 196
  echo -e \\n\*\*\* Compile: $file\\n$CMD
198 197
  eval $CMD
199 198

  
......
211 210
    exit 1
212 211
  fi
213 212
  fileobj=${file%.*}.obj
214
  CMD="$CXX -c $CXXFLAGS -o $fileobj $file"
213
  CMD="$CXX -c $CXXFLAGS -o$fileobj $file"
215 214
  echo -e \\n\*\*\* Compile: $file\\n$CMD
216 215
  eval $CMD
217 216
  if [[ ! -f $fileobj ]]; then
......
242 241
    model=${file%.*}
243 242
  fi
244 243
  if [ ! -z  "$dll" ]; then
245
    CMD="$CXX $LDFLAGS -o $model.so"
244
    CMD="$CXX $LDFLAGS -o$model.so"
246 245
  else
247
    CMD="$CXX $LDFLAGS -o $model"
246
    CMD="$CXX $LDFLAGS -o$model"
248 247
  fi
249 248
  CMD="$CMD $file $objs"
250 249
  if [ ! -f "$ADMB_HOME/contrib/lib/libcontrib.a" ]; then
......
295 294
    fi
296 295
  done
297 296
  if [ ! -z  "$dll" ]; then
298
    CMD="$CXX $LDFLAGS -o $outputfilebasename.so"
297
    CMD="$CXX $LDFLAGS -o$outputfilebasename.so"
299 298
  else
300
    CMD="$CXX $LDFLAGS -o $outputfilebasename"
299
    CMD="$CXX $LDFLAGS -o$outputfilebasename"
301 300
  fi
302 301
  CMD="$CMD $listobjs"
303 302
  if [ ! -f "$ADMB_HOME/contrib/lib/libcontrib.a" ]; then

Also available in: Unified diff