Changeset 425 for trunk/CoinMP/test


Ignore:
Timestamp:
Jan 11, 2011 12:55:42 PM (9 years ago)
Author:
bjarni
Message:

Lou changing configure.ac and Makefile.am

Location:
trunk/CoinMP/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CoinMP/test/Makefile.am

    r158 r425  
    9191endif
    9292
    93 if COIN_HAS_OSL
    94   AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    95         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    96   unitTest_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    97 endif
     93#if COIN_HAS_OSL
     94#  AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
     95#       -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
     96#  unitTest_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     97#endif
    9898
    9999if COIN_HAS_SPX
  • trunk/CoinMP/test/Makefile.in

    r416 r425  
    8787
    8888@COIN_HAS_MSK_TRUE@am__append_19 = $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    89 @COIN_HAS_OSL_TRUE@am__append_20 = -I`$(CYGPATH_W) $(OSLINCDIR)` \
    90 @COIN_HAS_OSL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    91 
    92 @COIN_HAS_OSL_TRUE@am__append_21 = $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    93 @COIN_HAS_SPX_TRUE@am__append_22 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
     89
     90#if COIN_HAS_OSL
     91#  AM_CPPFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
     92#       -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
     93#  unitTest_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     94#endif
     95@COIN_HAS_SPX_TRUE@am__append_20 = -I`$(CYGPATH_W) $(SPXINCDIR)` \
    9496@COIN_HAS_SPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    9597
    96 @COIN_HAS_SPX_TRUE@am__append_23 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    97 @COIN_HAS_SYMPHONY_TRUE@am__append_24 = -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
     98@COIN_HAS_SPX_TRUE@am__append_21 = $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     99@COIN_HAS_SYMPHONY_TRUE@am__append_22 = -I`$(CYGPATH_W) $(SYMPHONYSRCDIR)/src` \
    98100@COIN_HAS_SYMPHONY_TRUE@        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    99101
    100 @COIN_HAS_SYMPHONY_TRUE@am__append_25 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     102@COIN_HAS_SYMPHONY_TRUE@am__append_23 = $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    101103@COIN_HAS_SYMPHONY_TRUE@        $(SYMPHONYOBJDIR)/src/libSym.la
    102104
    103 @COIN_HAS_SYMPHONY_TRUE@am__append_26 = `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
    104 @COIN_HAS_VOL_TRUE@am__append_27 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
     105@COIN_HAS_SYMPHONY_TRUE@am__append_24 = `cat $(SYMPHONYOBJDIR)/sym_addlibs.txt`
     106@COIN_HAS_VOL_TRUE@am__append_25 = -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    105107@COIN_HAS_VOL_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    106108
    107 @COIN_HAS_VOL_TRUE@am__append_28 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     109@COIN_HAS_VOL_TRUE@am__append_26 = $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    108110@COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    109111
    110 @COIN_HAS_VOL_TRUE@am__append_29 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
    111 @COIN_HAS_XPR_TRUE@am__append_30 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
     112@COIN_HAS_VOL_TRUE@am__append_27 = `cat $(VOLOBJDIR)/vol_addlibs.txt`
     113@COIN_HAS_XPR_TRUE@am__append_28 = -I`$(CYGPATH_W) $(XPRINCDIR)` \
    112114@COIN_HAS_XPR_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    113115
    114 @COIN_HAS_XPR_TRUE@am__append_31 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    115 @COIN_HAS_ASL_TRUE@am__append_32 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
    116 @COIN_HAS_ASL_TRUE@am__append_33 = $(ASLLIB)
     116@COIN_HAS_XPR_TRUE@am__append_29 = $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     117@COIN_HAS_ASL_TRUE@am__append_30 = $(ASL_CPPFLAGS) -DCOIN_HAS_ASL
     118@COIN_HAS_ASL_TRUE@am__append_31 = $(ASLLIB)
    117119subdir = test
    118120DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    147149@COIN_HAS_MSK_TRUE@am__DEPENDENCIES_8 =  \
    148150@COIN_HAS_MSK_TRUE@     $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    149 @COIN_HAS_OSL_TRUE@am__DEPENDENCIES_9 =  \
    150 @COIN_HAS_OSL_TRUE@     $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    151 @COIN_HAS_SPX_TRUE@am__DEPENDENCIES_10 =  \
     151@COIN_HAS_SPX_TRUE@am__DEPENDENCIES_9 =  \
    152152@COIN_HAS_SPX_TRUE@     $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    153 @COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_11 =  \
     153@COIN_HAS_SYMPHONY_TRUE@am__DEPENDENCIES_10 =  \
    154154@COIN_HAS_SYMPHONY_TRUE@        $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    155155@COIN_HAS_SYMPHONY_TRUE@        $(SYMPHONYOBJDIR)/src/libSym.la
    156 @COIN_HAS_VOL_TRUE@am__DEPENDENCIES_12 =  \
     156@COIN_HAS_VOL_TRUE@am__DEPENDENCIES_11 =  \
    157157@COIN_HAS_VOL_TRUE@     $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    158158@COIN_HAS_VOL_TRUE@     $(VOLOBJDIR)/src/libVol.la
    159 @COIN_HAS_XPR_TRUE@am__DEPENDENCIES_13 =  \
     159@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_12 =  \
    160160@COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    161 am__DEPENDENCIES_14 =
    162 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_14)
     161am__DEPENDENCIES_13 =
    163162unitTest_DEPENDENCIES = ../src/libCoinMP.la $(am__DEPENDENCIES_1) \
    164163        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
     
    168167        $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
    169168        $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_13) \
    170         $(am__DEPENDENCIES_15) $(OSIOBJDIR)/src/libOsi.la \
     169        $(OSIOBJDIR)/src/libOsi.la \
    171170        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    172171depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    187186ABSBUILDDIR = @ABSBUILDDIR@
    188187ACLOCAL = @ACLOCAL@
    189 ADDLIBS = @ADDLIBS@
    190188ADD_CFLAGS = @ADD_CFLAGS@
    191189ADD_CXXFLAGS = @ADD_CXXFLAGS@
     
    196194AMTAR = @AMTAR@
    197195AR = @AR@
    198 ASLLIB = @ASLLIB@
    199 ASL_CPPFLAGS = @ASL_CPPFLAGS@
     196ASL_CFLAGS = @ASL_CFLAGS@
     197ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
     198ASL_DATA = @ASL_DATA@
     199ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
     200ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
     201ASL_LIBS = @ASL_LIBS@
     202ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
    200203AUTOCONF = @AUTOCONF@
    201204AUTOHEADER = @AUTOHEADER@
     
    204207AWK = @AWK@
    205208BUILDTOOLSDIR = @BUILDTOOLSDIR@
    206 CBCDOCDIR = @CBCDOCDIR@
    207 CBCOBJDIR = @CBCOBJDIR@
    208 CBCSRCDIR = @CBCSRCDIR@
     209CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
     210CBCGENERIC_CFLAGS_INSTALLED = @CBCGENERIC_CFLAGS_INSTALLED@
     211CBCGENERIC_DEPENDENCIES = @CBCGENERIC_DEPENDENCIES@
     212CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     213CBCGENERIC_LIBS_INSTALLED = @CBCGENERIC_LIBS_INSTALLED@
     214CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
     215CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     216CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
     217CBCLIB_CFLAGS_INSTALLED = @CBCLIB_CFLAGS_INSTALLED@
     218CBCLIB_DEPENDENCIES = @CBCLIB_DEPENDENCIES@
     219CBCLIB_LIBS = @CBCLIB_LIBS@
     220CBCLIB_LIBS_INSTALLED = @CBCLIB_LIBS_INSTALLED@
     221CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
     222CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
     223CBC_CFLAGS = @CBC_CFLAGS@
     224CBC_CFLAGS_INSTALLED = @CBC_CFLAGS_INSTALLED@
     225CBC_DATA = @CBC_DATA@
     226CBC_DATA_INSTALLED = @CBC_DATA_INSTALLED@
     227CBC_DEPENDENCIES = @CBC_DEPENDENCIES@
     228CBC_LIBS = @CBC_LIBS@
     229CBC_LIBS_INSTALLED = @CBC_LIBS_INSTALLED@
    209230CC = @CC@
    210231CCDEPMODE = @CCDEPMODE@
    211232CDEFS = @CDEFS@
    212233CFLAGS = @CFLAGS@
    213 CGLDOCDIR = @CGLDOCDIR@
    214 CGLOBJDIR = @CGLOBJDIR@
    215 CGLSRCDIR = @CGLSRCDIR@
    216 CLPDOCDIR = @CLPDOCDIR@
    217 CLPOBJDIR = @CLPOBJDIR@
    218 CLPSRCDIR = @CLPSRCDIR@
    219 COINMPDOCDIR = @COINMPDOCDIR@
    220 COINMPOBJDIR = @COINMPOBJDIR@
    221 COINMPSRCDIR = @COINMPSRCDIR@
    222 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    223 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    224 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    225 COIN_BUILD_GLPK_FALSE = @COIN_BUILD_GLPK_FALSE@
    226 COIN_BUILD_GLPK_TRUE = @COIN_BUILD_GLPK_TRUE@
     234CGL_CFLAGS = @CGL_CFLAGS@
     235CGL_CFLAGS_INSTALLED = @CGL_CFLAGS_INSTALLED@
     236CGL_DATA = @CGL_DATA@
     237CGL_DATA_INSTALLED = @CGL_DATA_INSTALLED@
     238CGL_DEPENDENCIES = @CGL_DEPENDENCIES@
     239CGL_LIBS = @CGL_LIBS@
     240CGL_LIBS_INSTALLED = @CGL_LIBS_INSTALLED@
     241CLP_CFLAGS = @CLP_CFLAGS@
     242CLP_CFLAGS_INSTALLED = @CLP_CFLAGS_INSTALLED@
     243CLP_DATA = @CLP_DATA@
     244CLP_DATA_INSTALLED = @CLP_DATA_INSTALLED@
     245CLP_DEPENDENCIES = @CLP_DEPENDENCIES@
     246CLP_LIBS = @CLP_LIBS@
     247CLP_LIBS_INSTALLED = @CLP_LIBS_INSTALLED@
     248COINMP_CFLAGS = @COINMP_CFLAGS@
     249COINMP_CFLAGS_INSTALLED = @COINMP_CFLAGS_INSTALLED@
     250COINMP_DEPENDENCIES = @COINMP_DEPENDENCIES@
     251COINMP_LIBS = @COINMP_LIBS@
     252COINMP_LIBS_INSTALLED = @COINMP_LIBS_INSTALLED@
     253COINMP_PCLIBS = @COINMP_PCLIBS@
     254COINMP_PCREQUIRES = @COINMP_PCREQUIRES@
     255COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
     256COINUTILS_CFLAGS_INSTALLED = @COINUTILS_CFLAGS_INSTALLED@
     257COINUTILS_DATA = @COINUTILS_DATA@
     258COINUTILS_DATA_INSTALLED = @COINUTILS_DATA_INSTALLED@
     259COINUTILS_DEPENDENCIES = @COINUTILS_DEPENDENCIES@
     260COINUTILS_LIBS = @COINUTILS_LIBS@
     261COINUTILS_LIBS_INSTALLED = @COINUTILS_LIBS_INSTALLED@
    227262COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
    228263COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     
    237272COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    238273COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    239 COIN_HAS_COINMP_FALSE = @COIN_HAS_COINMP_FALSE@
    240 COIN_HAS_COINMP_TRUE = @COIN_HAS_COINMP_TRUE@
    241274COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    242275COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     
    253286COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    254287COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    255 COIN_HAS_OSL_FALSE = @COIN_HAS_OSL_FALSE@
    256 COIN_HAS_OSL_TRUE = @COIN_HAS_OSL_TRUE@
     288COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     289COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
    257290COIN_HAS_SPX_FALSE = @COIN_HAS_SPX_FALSE@
    258291COIN_HAS_SPX_TRUE = @COIN_HAS_SPX_TRUE@
     
    263296COIN_HAS_XPR_FALSE = @COIN_HAS_XPR_FALSE@
    264297COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
     298COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     299COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    265300CPP = @CPP@
    266301CPPFLAGS = @CPPFLAGS@
    267 CPXINCDIR = @CPXINCDIR@
    268 CPXLIB = @CPXLIB@
     302CPX_CFLAGS = @CPX_CFLAGS@
     303CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
     304CPX_DATA = @CPX_DATA@
     305CPX_DATA_INSTALLED = @CPX_DATA_INSTALLED@
     306CPX_DEPENDENCIES = @CPX_DEPENDENCIES@
     307CPX_LIBS = @CPX_LIBS@
     308CPX_LIBS_INSTALLED = @CPX_LIBS_INSTALLED@
    269309CXX = @CXX@
    270310CXXCPP = @CXXCPP@
     
    277317DEFS = @DEFS@
    278318DEPDIR = @DEPDIR@
    279 DYLPDOCDIR = @DYLPDOCDIR@
    280 DYLPOBJDIR = @DYLPOBJDIR@
    281 DYLPSRCDIR = @DYLPSRCDIR@
     319DYLP_CFLAGS = @DYLP_CFLAGS@
     320DYLP_CFLAGS_INSTALLED = @DYLP_CFLAGS_INSTALLED@
     321DYLP_DATA = @DYLP_DATA@
     322DYLP_DATA_INSTALLED = @DYLP_DATA_INSTALLED@
     323DYLP_DEPENDENCIES = @DYLP_DEPENDENCIES@
     324DYLP_LIBS = @DYLP_LIBS@
     325DYLP_LIBS_INSTALLED = @DYLP_LIBS_INSTALLED@
    282326ECHO = @ECHO@
    283327ECHO_C = @ECHO_C@
     
    287331EXEEXT = @EXEEXT@
    288332F77 = @F77@
    289 FADDLIBS = @FADDLIBS@
    290333FFLAGS = @FFLAGS@
    291 FMPINCDIR = @FMPINCDIR@
    292 FMPLIB = @FMPLIB@
    293 GLPKINCDIR = @GLPKINCDIR@
    294 GLPKLIB = @GLPKLIB@
    295 GLPKOBJDIR = @GLPKOBJDIR@
     334FMP_CFLAGS = @FMP_CFLAGS@
     335FMP_CFLAGS_INSTALLED = @FMP_CFLAGS_INSTALLED@
     336FMP_DATA = @FMP_DATA@
     337FMP_DATA_INSTALLED = @FMP_DATA_INSTALLED@
     338FMP_DEPENDENCIES = @FMP_DEPENDENCIES@
     339FMP_LIBS = @FMP_LIBS@
     340FMP_LIBS_INSTALLED = @FMP_LIBS_INSTALLED@
     341GLPK_CFLAGS = @GLPK_CFLAGS@
     342GLPK_CFLAGS_INSTALLED = @GLPK_CFLAGS_INSTALLED@
     343GLPK_DATA = @GLPK_DATA@
     344GLPK_DATA_INSTALLED = @GLPK_DATA_INSTALLED@
     345GLPK_DEPENDENCIES = @GLPK_DEPENDENCIES@
     346GLPK_LIBS = @GLPK_LIBS@
     347GLPK_LIBS_INSTALLED = @GLPK_LIBS_INSTALLED@
    296348HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    297349HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    306358# List additional libraries
    307359LIBS = @LIBS@ $(am__append_3) $(am__append_5) $(am__append_8) \
    308         $(am__append_13) $(am__append_26) $(am__append_29) `cat \
     360        $(am__append_13) $(am__append_24) $(am__append_27) `cat \
    309361        $(OSIOBJDIR)/osi_addlibs.txt` `cat \
    310362        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
     
    320372MPICC = @MPICC@
    321373MPICXX = @MPICXX@
    322 MSKINCDIR = @MSKINCDIR@
    323 MSKLIB = @MSKLIB@
     374MSK_CFLAGS = @MSK_CFLAGS@
     375MSK_CFLAGS_INSTALLED = @MSK_CFLAGS_INSTALLED@
     376MSK_DATA = @MSK_DATA@
     377MSK_DATA_INSTALLED = @MSK_DATA_INSTALLED@
     378MSK_DEPENDENCIES = @MSK_DEPENDENCIES@
     379MSK_LIBS = @MSK_LIBS@
     380MSK_LIBS_INSTALLED = @MSK_LIBS_INSTALLED@
    324381OBJEXT = @OBJEXT@
    325382OPT_CFLAGS = @OPT_CFLAGS@
    326383OPT_CXXFLAGS = @OPT_CXXFLAGS@
    327 OSIDOCDIR = @OSIDOCDIR@
    328 OSIOBJDIR = @OSIOBJDIR@
    329 OSISRCDIR = @OSISRCDIR@
    330 OSLINCDIR = @OSLINCDIR@
    331 OSLLIB = @OSLLIB@
     384OSI_CFLAGS = @OSI_CFLAGS@
     385OSI_CFLAGS_INSTALLED = @OSI_CFLAGS_INSTALLED@
     386OSI_DATA = @OSI_DATA@
     387OSI_DATA_INSTALLED = @OSI_DATA_INSTALLED@
     388OSI_DEPENDENCIES = @OSI_DEPENDENCIES@
     389OSI_LIBS = @OSI_LIBS@
     390OSI_LIBS_INSTALLED = @OSI_LIBS_INSTALLED@
    332391PACKAGE = @PACKAGE@
    333392PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    337396PACKAGE_VERSION = @PACKAGE_VERSION@
    338397PATH_SEPARATOR = @PATH_SEPARATOR@
    339 PCADDLIBS = @PCADDLIBS@
     398PKG_CONFIG = @PKG_CONFIG@
    340399RANLIB = @RANLIB@
    341400RPATH_FLAGS = @RPATH_FLAGS@
    342401SET_MAKE = @SET_MAKE@
    343402SHELL = @SHELL@
    344 SPXINCDIR = @SPXINCDIR@
    345 SPXLIB = @SPXLIB@
     403SPX_CFLAGS = @SPX_CFLAGS@
     404SPX_CFLAGS_INSTALLED = @SPX_CFLAGS_INSTALLED@
     405SPX_DATA = @SPX_DATA@
     406SPX_DATA_INSTALLED = @SPX_DATA_INSTALLED@
     407SPX_DEPENDENCIES = @SPX_DEPENDENCIES@
     408SPX_LIBS = @SPX_LIBS@
     409SPX_LIBS_INSTALLED = @SPX_LIBS_INSTALLED@
    346410STRIP = @STRIP@
    347 SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    348 SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    349 SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
     411SYMPHONY_CFLAGS = @SYMPHONY_CFLAGS@
     412SYMPHONY_CFLAGS_INSTALLED = @SYMPHONY_CFLAGS_INSTALLED@
     413SYMPHONY_DATA = @SYMPHONY_DATA@
     414SYMPHONY_DATA_INSTALLED = @SYMPHONY_DATA_INSTALLED@
     415SYMPHONY_DEPENDENCIES = @SYMPHONY_DEPENDENCIES@
     416SYMPHONY_LIBS = @SYMPHONY_LIBS@
     417SYMPHONY_LIBS_INSTALLED = @SYMPHONY_LIBS_INSTALLED@
    350418VERSION = @VERSION@
    351 VOLDOCDIR = @VOLDOCDIR@
    352 VOLOBJDIR = @VOLOBJDIR@
    353 VOLSRCDIR = @VOLSRCDIR@
     419VOL_CFLAGS = @VOL_CFLAGS@
     420VOL_CFLAGS_INSTALLED = @VOL_CFLAGS_INSTALLED@
     421VOL_DATA = @VOL_DATA@
     422VOL_DATA_INSTALLED = @VOL_DATA_INSTALLED@
     423VOL_DEPENDENCIES = @VOL_DEPENDENCIES@
     424VOL_LIBS = @VOL_LIBS@
     425VOL_LIBS_INSTALLED = @VOL_LIBS_INSTALLED@
    354426VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    355 XPRINCDIR = @XPRINCDIR@
    356 XPRLIB = @XPRLIB@
     427XPR_CFLAGS = @XPR_CFLAGS@
     428XPR_CFLAGS_INSTALLED = @XPR_CFLAGS_INSTALLED@
     429XPR_DATA = @XPR_DATA@
     430XPR_DATA_INSTALLED = @XPR_DATA_INSTALLED@
     431XPR_DEPENDENCIES = @XPR_DEPENDENCIES@
     432XPR_LIBS = @XPR_LIBS@
     433XPR_LIBS_INSTALLED = @XPR_LIBS_INSTALLED@
    357434_SVN_REV = @_SVN_REV@
    358435abs_bin_dir = @abs_bin_dir@
     
    368445ac_ct_STRIP = @ac_ct_STRIP@
    369446ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     447ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    370448am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    371449am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    419497        $(am__append_7) $(am__append_10) $(am__append_12) \
    420498        $(am__append_15) $(am__append_17) $(am__append_19) \
    421         $(am__append_21) $(am__append_23) $(am__append_25) \
    422         $(am__append_28) $(am__append_31) $(am__append_33) \
    423         $(OSIOBJDIR)/src/libOsi.la \
     499        $(am__append_21) $(am__append_23) $(am__append_26) \
     500        $(am__append_29) $(am__append_31) $(OSIOBJDIR)/src/libOsi.la \
    424501        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    425502
     
    432509        $(am__append_9) $(am__append_11) $(am__append_14) \
    433510        $(am__append_16) $(am__append_18) $(am__append_20) \
    434         $(am__append_22) $(am__append_24) $(am__append_27) \
    435         $(am__append_30) $(am__append_32)
     511        $(am__append_22) $(am__append_25) $(am__append_28) \
     512        $(am__append_30)
    436513
    437514# This line is necessary to allow VPATH compilation with MS compilers
Note: See TracChangeset for help on using the changeset viewer.