Changeset 108


Ignore:
Timestamp:
Nov 4, 2006 10:40:38 AM (12 years ago)
Author:
ladanyi
Message:

fixed Makefile.am to correctly build ampl library

Location:
branches/devel/Bonmin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/configure

    r105 r108  
    2380323803
    2380423804if test x"$coin_vpath_link_files" = x; then : ; else
    23805   { echo "$as_me:$LINENO: Creating VPATH links for data files" >&5
     23805  lnkcmd=
     23806  if test "$enable_doscompile" = yes; then
     23807    lnkcmd=cp
     23808  fi
     23809  case "$CC" in
     23810    cl* | */cl*)
     23811      lnkcmd=cp ;;
     23812  esac
     23813  if test "$lnkcmd" = cp; then
     23814    { echo "$as_me:$LINENO: Copying data files for VPATH configuration" >&5
     23815echo "$as_me: Copying data files for VPATH configuration" >&6;}
     23816  else
     23817    echo "$as_me:$LINENO: checking whether ln -s works" >&5
     23818echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
     23819LN_S=$as_ln_s
     23820if test "$LN_S" = "ln -s"; then
     23821  echo "$as_me:$LINENO: result: yes" >&5
     23822echo "${ECHO_T}yes" >&6
     23823else
     23824  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
     23825echo "${ECHO_T}no, using $LN_S" >&6
     23826fi
     23827
     23828    { echo "$as_me:$LINENO: Creating VPATH links for data files" >&5
    2380623829echo "$as_me: Creating VPATH links for data files" >&6;}
     23830    lnkcmd="$LN_S"
     23831  fi
    2380723832  for file in $coin_vpath_link_files; do
     23833    dir=`echo ./$file | sed -e 's|^/*$||'`
     23834    if test -d $dir; then : ; else
     23835      { if $as_mkdir_p; then
     23836    mkdir -p $dir
     23837  else
     23838    as_dir=$dir
     23839    as_dirs=
     23840    while test ! -d "$as_dir"; do
     23841      as_dirs="$as_dir $as_dirs"
     23842      as_dir=`(dirname "$as_dir") 2>/dev/null ||
     23843$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     23844         X"$as_dir" : 'X\(//\)[^/]' \| \
     23845         X"$as_dir" : 'X\(//\)$' \| \
     23846         X"$as_dir" : 'X\(/\)' \| \
     23847         .     : '\(.\)' 2>/dev/null ||
     23848echo X"$as_dir" |
     23849    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
     23850          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
     23851          /^X\(\/\/\)$/{ s//\1/; q; }
     23852          /^X\(\/\).*/{ s//\1/; q; }
     23853          s/.*/./; q'`
     23854    done
     23855    test ! -n "$as_dirs" || mkdir $as_dirs
     23856  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dir" >&5
     23857echo "$as_me: error: cannot create directory $dir" >&2;}
     23858   { (exit 1); exit 1; }; }; }
     23859
     23860    fi
    2380823861    rm -f $file
    23809     $LN_S $abs_source_dir/$file $file
     23862    $lnkcmd $abs_source_dir/$file $file
    2381023863  done
    2381123864fi
  • branches/devel/Bonmin/experimental/Bcp/Makefile.am

    r105 r108  
    5252        mkdir -p solvers ; \
    5353        cd solvers ; \
    54         for f in $(AMPL_SRC)/*.c* $(AMPL_SRC)/*.h*; do \
     54        for f in $(AMPL_SRC)/*.c* $(AMPL_SRC)/*.h* $(AMPL_SRC)/makefile.u; do \
    5555                $(LN_S) $$f ; \
    5656        done ; \
     
    7070                rm $$f.orig ; \
    7171        done ; \
    72         sed -e 's/CFLAGS =/CFLAGS = -DNO_FUNCADD/g' $(AMPL_SRC)/makefile.u > makefile.u ; \
    73         eval `grep ASLMAKEFLAGS ../../../../ThirdParty/ASL/config.log | tail -1`; \
    74         $(MAKE) $$ASLMAKEFLAGS -f makefile.u ; \
     72        rm -f aslflags.txt ; \
     73        grep ASLMAKEFLAGS ../../../../ThirdParty/ASL/config.log | tail -1 > aslflags.txt ; \
     74        cat aslflags.txt ; \
     75        eval `sed -e "s/ CFLAGS=\".*\"//" aslflags.txt`; \
     76        eval `sed -e "s/.*CFLAGS=\"\(.*\)\".*/CFLAGS=\"-DNO_FUNCADD \1\"/" aslflags.txt` ; \
     77        $(MAKE) $$ASLMAKEFLAGS CFLAGS="$$CFLAGS" -f makefile.u ; \
    7578        cp amplsolver.a ..
    7679
  • branches/devel/Bonmin/experimental/Bcp/Makefile.in

    r105 r108  
    656656        mkdir -p solvers ; \
    657657        cd solvers ; \
    658         for f in $(AMPL_SRC)/*.c* $(AMPL_SRC)/*.h*; do \
     658        for f in $(AMPL_SRC)/*.c* $(AMPL_SRC)/*.h* $(AMPL_SRC)/makefile.u; do \
    659659                $(LN_S) $$f ; \
    660660        done ; \
     
    674674                rm $$f.orig ; \
    675675        done ; \
    676         sed -e 's/CFLAGS =/CFLAGS = -DNO_FUNCADD/g' $(AMPL_SRC)/makefile.u > makefile.u ; \
    677         eval `grep ASLMAKEFLAGS ../../../../ThirdParty/ASL/config.log | tail -1`; \
    678         $(MAKE) $$ASLMAKEFLAGS -f makefile.u ; \
     676        rm -f aslflags.txt ; \
     677        grep ASLMAKEFLAGS ../../../../ThirdParty/ASL/config.log | tail -1 > aslflags.txt ; \
     678        cat aslflags.txt ; \
     679        eval `sed -e "s/ CFLAGS=\".*\"//" aslflags.txt`; \
     680        eval `sed -e "s/.*CFLAGS=\"\(.*\)\".*/CFLAGS=\"-DNO_FUNCADD \1\"/" aslflags.txt` ; \
     681        $(MAKE) $$ASLMAKEFLAGS CFLAGS="$$CFLAGS" -f makefile.u ; \
    679682        cp amplsolver.a ..
    680683# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.