Changeset 213


Ignore:
Timestamp:
May 15, 2006 12:24:34 AM (13 years ago)
Author:
andreasw
Message:

Several fixes to make autotools work on Cygwin

Location:
trunk/Cgl
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cgl/configure

    r212 r213  
    17011701
    17021702
     1703# This package is written in C++
     1704ac_ext=cc
     1705ac_cpp='$CXXCPP $CPPFLAGS'
     1706ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     1707ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     1708ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     1709
     1710
    17031711# Get the name of the C++ compiler and appropriate compiler options
    17041712
     
    23012309        coin_add_cxxflags="-pipe"
    23022310        coin_dbg_cxxflags="-g"
    2303         coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wconversion"
     2311        coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
    23042312
    23052313        case $build in
     
    26242632CXXFLAGS="$coin_cv_cxxflags"
    26252633
    2626 ac_ext=c
    2627 ac_cpp='$CPP $CPPFLAGS'
    2628 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    2629 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    2630 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     2634ac_ext=cc
     2635ac_cpp='$CXXCPP $CPPFLAGS'
     2636ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     2637ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     2638ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    26312639
    26322640
     
    39253933
    39263934
    3927 ac_ext=c
    3928 ac_cpp='$CPP $CPPFLAGS'
    3929 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    3930 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    3931 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     3935ac_ext=cc
     3936ac_cpp='$CXXCPP $CPPFLAGS'
     3937ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     3938ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     3939ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    39323940
    39333941
     
    44804488*-*-irix6*)
    44814489  # Find out which ABI we are using.
    4482   echo '#line 4482 "configure"' > conftest.$ac_ext
     4490  echo '#line 4490 "configure"' > conftest.$ac_ext
    44834491  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    44844492  (eval $ac_compile) 2>&5
     
    56145622
    56155623# Provide some information about the compiler.
    5616 echo "$as_me:5616:" \
     5624echo "$as_me:5624:" \
    56175625     "checking for Fortran 77 compiler version" >&5
    56185626ac_compiler=`set X $ac_compile; echo $2`
     
    57525760
    57535761G77=`test $ac_compiler_gnu = yes && echo yes`
    5754 ac_ext=c
    5755 ac_cpp='$CPP $CPPFLAGS'
    5756 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    5757 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    5758 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     5762ac_ext=cc
     5763ac_cpp='$CXXCPP $CPPFLAGS'
     5764ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     5765ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     5766ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    57595767
    57605768
     
    66816689   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    66826690   -e 's:$: $lt_compiler_flag:'`
    6683    (eval echo "\"\$as_me:6683: $lt_compile\"" >&5)
     6691   (eval echo "\"\$as_me:6691: $lt_compile\"" >&5)
    66846692   (eval "$lt_compile" 2>conftest.err)
    66856693   ac_status=$?
    66866694   cat conftest.err >&5
    6687    echo "$as_me:6687: \$? = $ac_status" >&5
     6695   echo "$as_me:6695: \$? = $ac_status" >&5
    66886696   if (exit $ac_status) && test -s "$ac_outfile"; then
    66896697     # The compiler can only warn and ignore the option if not recognized
     
    69496957   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    69506958   -e 's:$: $lt_compiler_flag:'`
    6951    (eval echo "\"\$as_me:6951: $lt_compile\"" >&5)
     6959   (eval echo "\"\$as_me:6959: $lt_compile\"" >&5)
    69526960   (eval "$lt_compile" 2>conftest.err)
    69536961   ac_status=$?
    69546962   cat conftest.err >&5
    6955    echo "$as_me:6955: \$? = $ac_status" >&5
     6963   echo "$as_me:6963: \$? = $ac_status" >&5
    69566964   if (exit $ac_status) && test -s "$ac_outfile"; then
    69576965     # The compiler can only warn and ignore the option if not recognized
     
    70537061   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70547062   -e 's:$: $lt_compiler_flag:'`
    7055    (eval echo "\"\$as_me:7055: $lt_compile\"" >&5)
     7063   (eval echo "\"\$as_me:7063: $lt_compile\"" >&5)
    70567064   (eval "$lt_compile" 2>out/conftest.err)
    70577065   ac_status=$?
    70587066   cat out/conftest.err >&5
    7059    echo "$as_me:7059: \$? = $ac_status" >&5
     7067   echo "$as_me:7067: \$? = $ac_status" >&5
    70607068   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    70617069   then
     
    93989406  lt_status=$lt_dlunknown
    93999407  cat > conftest.$ac_ext <<EOF
    9400 #line 9400 "configure"
     9408#line 9408 "configure"
    94019409#include "confdefs.h"
    94029410
     
    94989506  lt_status=$lt_dlunknown
    94999507  cat > conftest.$ac_ext <<EOF
    9500 #line 9500 "configure"
     9508#line 9508 "configure"
    95019509#include "confdefs.h"
    95029510
     
    1012210130
    1012310131
    10124 ac_ext=c
    10125 ac_cpp='$CPP $CPPFLAGS'
    10126 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    10127 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    10128 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     10132ac_ext=cc
     10133ac_cpp='$CXXCPP $CPPFLAGS'
     10134ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     10135ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     10136ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1012910137
    1013010138CC="$lt_save_CC"
     
    1184211850   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1184311851   -e 's:$: $lt_compiler_flag:'`
    11844    (eval echo "\"\$as_me:11844: $lt_compile\"" >&5)
     11852   (eval echo "\"\$as_me:11852: $lt_compile\"" >&5)
    1184511853   (eval "$lt_compile" 2>conftest.err)
    1184611854   ac_status=$?
    1184711855   cat conftest.err >&5
    11848    echo "$as_me:11848: \$? = $ac_status" >&5
     11856   echo "$as_me:11856: \$? = $ac_status" >&5
    1184911857   if (exit $ac_status) && test -s "$ac_outfile"; then
    1185011858     # The compiler can only warn and ignore the option if not recognized
     
    1194611954   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1194711955   -e 's:$: $lt_compiler_flag:'`
    11948    (eval echo "\"\$as_me:11948: $lt_compile\"" >&5)
     11956   (eval echo "\"\$as_me:11956: $lt_compile\"" >&5)
    1194911957   (eval "$lt_compile" 2>out/conftest.err)
    1195011958   ac_status=$?
    1195111959   cat out/conftest.err >&5
    11952    echo "$as_me:11952: \$? = $ac_status" >&5
     11960   echo "$as_me:11960: \$? = $ac_status" >&5
    1195311961   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1195411962   then
     
    1313313141
    1313413142
    13135 ac_ext=c
    13136 ac_cpp='$CPP $CPPFLAGS'
    13137 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    13138 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    13139 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     13143ac_ext=cc
     13144ac_cpp='$CXXCPP $CPPFLAGS'
     13145ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     13146ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     13147ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1314013148
    1314113149CC=$lt_save_CC
     
    1351613524   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1351713525   -e 's:$: $lt_compiler_flag:'`
    13518    (eval echo "\"\$as_me:13518: $lt_compile\"" >&5)
     13526   (eval echo "\"\$as_me:13526: $lt_compile\"" >&5)
    1351913527   (eval "$lt_compile" 2>conftest.err)
    1352013528   ac_status=$?
    1352113529   cat conftest.err >&5
    13522    echo "$as_me:13522: \$? = $ac_status" >&5
     13530   echo "$as_me:13530: \$? = $ac_status" >&5
    1352313531   if (exit $ac_status) && test -s "$ac_outfile"; then
    1352413532     # The compiler can only warn and ignore the option if not recognized
     
    1362013628   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1362113629   -e 's:$: $lt_compiler_flag:'`
    13622    (eval echo "\"\$as_me:13622: $lt_compile\"" >&5)
     13630   (eval echo "\"\$as_me:13630: $lt_compile\"" >&5)
    1362313631   (eval "$lt_compile" 2>out/conftest.err)
    1362413632   ac_status=$?
    1362513633   cat out/conftest.err >&5
    13626    echo "$as_me:13626: \$? = $ac_status" >&5
     13634   echo "$as_me:13634: \$? = $ac_status" >&5
    1362713635   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1362813636   then
     
    1572015728
    1572115729
    15722 ac_ext=c
    15723 ac_cpp='$CPP $CPPFLAGS'
    15724 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    15725 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    15726 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     15730ac_ext=cc
     15731ac_cpp='$CXXCPP $CPPFLAGS'
     15732ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     15733ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     15734ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1572715735
    1572815736CC="$lt_save_CC"
     
    1582715835   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1582815836   -e 's:$: $lt_compiler_flag:'`
    15829    (eval echo "\"\$as_me:15829: $lt_compile\"" >&5)
     15837   (eval echo "\"\$as_me:15837: $lt_compile\"" >&5)
    1583015838   (eval "$lt_compile" 2>conftest.err)
    1583115839   ac_status=$?
    1583215840   cat conftest.err >&5
    15833    echo "$as_me:15833: \$? = $ac_status" >&5
     15841   echo "$as_me:15841: \$? = $ac_status" >&5
    1583415842   if (exit $ac_status) && test -s "$ac_outfile"; then
    1583515843     # The compiler can only warn and ignore the option if not recognized
     
    1609516103   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1609616104   -e 's:$: $lt_compiler_flag:'`
    16097    (eval echo "\"\$as_me:16097: $lt_compile\"" >&5)
     16105   (eval echo "\"\$as_me:16105: $lt_compile\"" >&5)
    1609816106   (eval "$lt_compile" 2>conftest.err)
    1609916107   ac_status=$?
    1610016108   cat conftest.err >&5
    16101    echo "$as_me:16101: \$? = $ac_status" >&5
     16109   echo "$as_me:16109: \$? = $ac_status" >&5
    1610216110   if (exit $ac_status) && test -s "$ac_outfile"; then
    1610316111     # The compiler can only warn and ignore the option if not recognized
     
    1619916207   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1620016208   -e 's:$: $lt_compiler_flag:'`
    16201    (eval echo "\"\$as_me:16201: $lt_compile\"" >&5)
     16209   (eval echo "\"\$as_me:16209: $lt_compile\"" >&5)
    1620216210   (eval "$lt_compile" 2>out/conftest.err)
    1620316211   ac_status=$?
    1620416212   cat out/conftest.err >&5
    16205    echo "$as_me:16205: \$? = $ac_status" >&5
     16213   echo "$as_me:16213: \$? = $ac_status" >&5
    1620616214   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1620716215   then
     
    1667516683  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1667616684  (exit $ac_status); } &&
    16677          { ac_try='test -z "$ac_c_werror_flag"
     16685         { ac_try='test -z "$ac_cxx_werror_flag"
    1667816686                         || test ! -s conftest.err'
    1667916687  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1673616744  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1673716745  (exit $ac_status); } &&
    16738          { ac_try='test -z "$ac_c_werror_flag"
     16746         { ac_try='test -z "$ac_cxx_werror_flag"
    1673916747                         || test ! -s conftest.err'
    1674016748  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    1831918327
    1832018328
    18321 ac_ext=c
    18322 ac_cpp='$CPP $CPPFLAGS'
    18323 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    18324 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    18325 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     18329ac_ext=cc
     18330ac_cpp='$CXXCPP $CPPFLAGS'
     18331ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     18332ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     18333ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1832618334
    1832718335CC="$lt_save_CC"
     
    1880018808
    1880118809
    18802 ac_ext=c
    18803 ac_cpp='$CPP $CPPFLAGS'
    18804 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    18805 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    18806 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     18810ac_ext=cc
     18811ac_cpp='$CXXCPP $CPPFLAGS'
     18812ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     18813ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     18814ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1880718815
    1880818816CC="$lt_save_CC"
     
    1949719505      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    1949819506          -e 's|fix_srcfile_path=\"\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    19499           -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="`$CYGPATH_W \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"'` \$compile_deplibs\"'% \
    19500           -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="`$CYGPATH_W \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"'` \$compile_deplibs\"'% \
     19507          -e 's%compile_deplibs=\"\$dir/\$old_library \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$old_library | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
     19508          -e 's%compile_deplibs=\"\$dir/\$linklib \$compile_deplibs\"%compile_deplibs="'\`"$CYGPATH_W"' \$dir/\$linklib | sed -e '"'"'sY\\\\\\\\Y/Yg'"'"\`' \$compile_deplibs\"'% \
    1950119509          -e 's%lib /OUT:%lib -OUT:%' \
    1950219510          -e "s%cygpath -w%$CYGPATH_W%"\
     
    1993319941  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    1993419942  (exit $ac_status); } &&
    19935          { ac_try='test -z "$ac_c_werror_flag"
     19943         { ac_try='test -z "$ac_cxx_werror_flag"
    1993619944                         || test ! -s conftest.err'
    1993719945  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2000120009  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2000220010  (exit $ac_status); } &&
    20003          { ac_try='test -z "$ac_c_werror_flag"
     20011         { ac_try='test -z "$ac_cxx_werror_flag"
    2000420012                         || test ! -s conftest.err'
    2000520013  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2013620144  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2013720145  (exit $ac_status); } &&
    20138          { ac_try='test -z "$ac_c_werror_flag"
     20146         { ac_try='test -z "$ac_cxx_werror_flag"
    2013920147                         || test ! -s conftest.err'
    2014020148  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2029920307  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2030020308  (exit $ac_status); } &&
    20301          { ac_try='test -z "$ac_c_werror_flag"
     20309         { ac_try='test -z "$ac_cxx_werror_flag"
    2030220310                         || test ! -s conftest.err'
    2030320311  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2052420532  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2052520533  (exit $ac_status); } &&
    20526          { ac_try='test -z "$ac_c_werror_flag"
     20534         { ac_try='test -z "$ac_cxx_werror_flag"
    2052720535                         || test ! -s conftest.err'
    2052820536  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2068720695  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2068820696  (exit $ac_status); } &&
    20689          { ac_try='test -z "$ac_c_werror_flag"
     20697         { ac_try='test -z "$ac_cxx_werror_flag"
    2069020698                         || test ! -s conftest.err'
    2069120699  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     
    2093820946  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    2093920947  (exit $ac_status); } &&
    20940          { ac_try='test -z "$ac_c_werror_flag"
     20948         { ac_try='test -z "$ac_cxx_werror_flag"
    2094120949                         || test ! -s conftest.err'
    2094220950  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  • trunk/Cgl/configure.ac

    r212 r213  
    4848# Check if user wants to produce debugging code
    4949AC_COIN_DEBUG_COMPILE
     50
     51# This package is written in C++
     52AC_LANG(C++)
    5053
    5154# Get the name of the C++ compiler and appropriate compiler options
  • trunk/Cgl/test/Makefile.am

    r212 r213  
    1818
    1919# List libraries of COIN projects
    20 unitTest_LDADD = ../src/libCgl.la $(OSIOBJDIR)/src/libOsi.la
    21 
    22 # List additional libraries
    23 LIBS += `cat $(OSIOBJDIR)/osi_addlibs.txt`
     20unitTest_LDADD = ../src/libCgl.la
    2421
    2522# Here list all include flags, relative to this "srcdir" directory.  This
     
    124121
    125122# Finally the Coin library (many of the above need it)
    126 unitTest_LDADD += $(COINUTILSOBJDIR)/src/libCoinUtils.la
    127 LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
     123unitTest_LDADD += \
     124        $(OSIOBJDIR)/src/libOsi.la \
     125        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    128126
    129 test: unitTest
    130         ./unitTest
     127# List additional libraries
     128LIBS += `cat $(OSIOBJDIR)/osi_addlibs.txt`\
     129        `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` \
     130        $(ADDLIBS)
     131
     132test: unitTest$(EXEEXT)
     133        ./unitTest$(EXEEXT)
     134
     135.PHONY: test
    131136
    132137########################################################################
  • trunk/Cgl/test/Makefile.in

    r212 r213  
    154154@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_12 =  \
    155155@COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    156 unitTest_DEPENDENCIES = ../src/libCgl.la $(OSIOBJDIR)/src/libOsi.la \
    157         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
    158         $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
    159         $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
    160         $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
    161         $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
    162         $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \
     156unitTest_DEPENDENCIES = ../src/libCgl.la $(am__DEPENDENCIES_1) \
     157        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
     158        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
     159        $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
     160        $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9) \
     161        $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
     162        $(am__DEPENDENCIES_12) $(OSIOBJDIR)/src/libOsi.la \
    163163        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    164164DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
     
    288288
    289289# List additional libraries
    290 LIBS = @LIBS@ `cat $(OSIOBJDIR)/osi_addlibs.txt` $(am__append_3) \
    291         $(am__append_6) $(am__append_11) $(am__append_24) \
    292         $(am__append_27) `cat \
     290LIBS = @LIBS@ $(am__append_3) $(am__append_6) $(am__append_11) \
     291        $(am__append_24) $(am__append_27) `cat \
     292        $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    293293        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    294294LIBTOOL = @LIBTOOL@
     
    383383
    384384# Finally the Coin library (many of the above need it)
    385 unitTest_LDADD = ../src/libCgl.la $(OSIOBJDIR)/src/libOsi.la \
    386         $(am__append_2) $(am__append_5) $(am__append_8) \
    387         $(am__append_10) $(am__append_13) $(am__append_15) \
    388         $(am__append_17) $(am__append_19) $(am__append_21) \
    389         $(am__append_23) $(am__append_26) $(am__append_29) \
     385unitTest_LDADD = ../src/libCgl.la $(am__append_2) $(am__append_5) \
     386        $(am__append_8) $(am__append_10) $(am__append_13) \
     387        $(am__append_15) $(am__append_17) $(am__append_19) \
     388        $(am__append_21) $(am__append_23) $(am__append_26) \
     389        $(am__append_29) $(OSIOBJDIR)/src/libOsi.la \
    390390        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    391391
     
    648648
    649649
    650 test: unitTest
    651         ./unitTest
     650test: unitTest$(EXEEXT)
     651        ./unitTest$(EXEEXT)
     652
     653.PHONY: test
    652654# Tell versions [3.59,3.63) of GNU make to not export all variables.
    653655# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.