Changeset 2096


Ignore:
Timestamp:
03/07/06 23:07:55 (8 years ago)
Author:
wehart
Message:

Rework of Makefile's to eliminate the use of the *_DIR variables.

( Links to Acro-related mail archives at  http://software.sandia.gov/Acro/ )

Location:
coliny/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coliny/trunk/Makefile.in

    r2095 r2096  
    7373AMDEP_FALSE = @AMDEP_FALSE@ 
    7474AMDEP_TRUE = @AMDEP_TRUE@ 
    75 AMPL_DIR = @AMPL_DIR@ 
    7675AMTAR = @AMTAR@ 
    77 APPSPACK_DIR = @APPSPACK_DIR@ 
    7876AUTOCONF = @AUTOCONF@ 
    7977AUTOHEADER = @AUTOHEADER@ 
     
    146144CCDEPMODE = @CCDEPMODE@ 
    147145CFLAGS = @CFLAGS@ 
    148 COIN_DIR = @COIN_DIR@ 
    149 COLINY_DIR = @COLINY_DIR@ 
    150 COLIN_DIR = @COLIN_DIR@ 
    151146CPPFLAGS = @CPPFLAGS@ 
    152147CXX = @CXX@ 
     
    161156ECHO_T = @ECHO_T@ 
    162157EGREP = @EGREP@ 
    163 EXACT_DIR = @EXACT_DIR@ 
    164158EXEEXT = @EXEEXT@ 
    165159F77 = @F77@ 
    166160FFLAGS = @FFLAGS@ 
    167 FILIB_DIR = @FILIB_DIR@ 
    168161FLIBS = @FLIBS@ 
    169 GLPK_DIR = @GLPK_DIR@ 
    170 GNLP_DIR = @GNLP_DIR@ 
    171162HAVE_ANSI_CPP_HEADERS_FALSE = @HAVE_ANSI_CPP_HEADERS_FALSE@ 
    172163HAVE_ANSI_CPP_HEADERS_TRUE = @HAVE_ANSI_CPP_HEADERS_TRUE@ 
     
    193184INSTALL_SCRIPT = @INSTALL_SCRIPT@ 
    194185INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 
    195 IPOPT_DIR = @IPOPT_DIR@ 
    196186LAPACK_LIBS = @LAPACK_LIBS@ 
    197187LDFLAGS = @LDFLAGS@ 
     
    214204MPI_LIBDIR = @MPI_LIBDIR@ 
    215205MPI_LIBS = @MPI_LIBS@ 
    216 MTL_DIR = @MTL_DIR@ 
    217206OBJEXT = @OBJEXT@ 
    218207PACKAGE = @PACKAGE@ 
     
    222211PACKAGE_TARNAME = @PACKAGE_TARNAME@ 
    223212PACKAGE_VERSION = @PACKAGE_VERSION@ 
    224 PARPCX_DIR = @PARPCX_DIR@ 
    225213PATH_SEPARATOR = @PATH_SEPARATOR@ 
    226 PICOCORE_DIR = @PICOCORE_DIR@ 
    227 PICOMILP_DIR = @PICOMILP_DIR@ 
    228 PLS_DIR = @PLS_DIR@ 
    229214RANLIB = @RANLIB@ 
    230215RECONFIGURE_MTL_FALSE = @RECONFIGURE_MTL_FALSE@ 
     
    232217SET_MAKE = @SET_MAKE@ 
    233218SHELL = @SHELL@ 
    234 SOPLEX_DIR = @SOPLEX_DIR@ 
    235219STRIP = @STRIP@ 
    236220TARGET_CYGWIN_FALSE = @TARGET_CYGWIN_FALSE@ 
     
    242226TARGET_SOLARIS_FALSE = @TARGET_SOLARIS_FALSE@ 
    243227TARGET_SOLARIS_TRUE = @TARGET_SOLARIS_TRUE@ 
    244 THREEPO_DIR = @THREEPO_DIR@ 
    245228TPL_DIR = @TPL_DIR@ 
    246229USE_MPI_CC_FALSE = @USE_MPI_CC_FALSE@ 
     
    250233USE_MPI_F77_FALSE = @USE_MPI_F77_FALSE@ 
    251234USE_MPI_F77_TRUE = @USE_MPI_F77_TRUE@ 
    252 UTILIB_DIR = @UTILIB_DIR@ 
    253235VERSION = @VERSION@ 
    254236WORDS_BIGENDIAN_FALSE = @WORDS_BIGENDIAN_FALSE@ 
  • coliny/trunk/coliny/Makefile.in

    r2095 r2096  
    137137AMDEP_FALSE = @AMDEP_FALSE@ 
    138138AMDEP_TRUE = @AMDEP_TRUE@ 
    139 AMPL_DIR = @AMPL_DIR@ 
    140139AMTAR = @AMTAR@ 
    141 APPSPACK_DIR = @APPSPACK_DIR@ 
    142140AUTOCONF = @AUTOCONF@ 
    143141AUTOHEADER = @AUTOHEADER@ 
     
    210208CCDEPMODE = @CCDEPMODE@ 
    211209CFLAGS = @CFLAGS@ 
    212 COIN_DIR = @COIN_DIR@ 
    213 COLINY_DIR = @COLINY_DIR@ 
    214 COLIN_DIR = @COLIN_DIR@ 
    215210CPPFLAGS = @CPPFLAGS@ 
    216211CXX = @CXX@ 
     
    225220ECHO_T = @ECHO_T@ 
    226221EGREP = @EGREP@ 
    227 EXACT_DIR = @EXACT_DIR@ 
    228222EXEEXT = @EXEEXT@ 
    229223F77 = @F77@ 
    230224FFLAGS = @FFLAGS@ 
    231 FILIB_DIR = @FILIB_DIR@ 
    232225FLIBS = @FLIBS@ 
    233 GLPK_DIR = @GLPK_DIR@ 
    234 GNLP_DIR = @GNLP_DIR@ 
    235226HAVE_ANSI_CPP_HEADERS_FALSE = @HAVE_ANSI_CPP_HEADERS_FALSE@ 
    236227HAVE_ANSI_CPP_HEADERS_TRUE = @HAVE_ANSI_CPP_HEADERS_TRUE@ 
     
    257248INSTALL_SCRIPT = @INSTALL_SCRIPT@ 
    258249INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 
    259 IPOPT_DIR = @IPOPT_DIR@ 
    260250LAPACK_LIBS = @LAPACK_LIBS@ 
    261251LDFLAGS = @LDFLAGS@ 
     
    278268MPI_LIBDIR = @MPI_LIBDIR@ 
    279269MPI_LIBS = @MPI_LIBS@ 
    280 MTL_DIR = @MTL_DIR@ 
    281270OBJEXT = @OBJEXT@ 
    282271PACKAGE = @PACKAGE@ 
     
    286275PACKAGE_TARNAME = @PACKAGE_TARNAME@ 
    287276PACKAGE_VERSION = @PACKAGE_VERSION@ 
    288 PARPCX_DIR = @PARPCX_DIR@ 
    289277PATH_SEPARATOR = @PATH_SEPARATOR@ 
    290 PICOCORE_DIR = @PICOCORE_DIR@ 
    291 PICOMILP_DIR = @PICOMILP_DIR@ 
    292 PLS_DIR = @PLS_DIR@ 
    293278RANLIB = @RANLIB@ 
    294279RECONFIGURE_MTL_FALSE = @RECONFIGURE_MTL_FALSE@ 
     
    296281SET_MAKE = @SET_MAKE@ 
    297282SHELL = @SHELL@ 
    298 SOPLEX_DIR = @SOPLEX_DIR@ 
    299283STRIP = @STRIP@ 
    300284TARGET_CYGWIN_FALSE = @TARGET_CYGWIN_FALSE@ 
     
    306290TARGET_SOLARIS_FALSE = @TARGET_SOLARIS_FALSE@ 
    307291TARGET_SOLARIS_TRUE = @TARGET_SOLARIS_TRUE@ 
    308 THREEPO_DIR = @THREEPO_DIR@ 
    309292TPL_DIR = @TPL_DIR@ 
    310293USE_MPI_CC_FALSE = @USE_MPI_CC_FALSE@ 
     
    314297USE_MPI_F77_FALSE = @USE_MPI_F77_FALSE@ 
    315298USE_MPI_F77_TRUE = @USE_MPI_F77_TRUE@ 
    316 UTILIB_DIR = @UTILIB_DIR@ 
    317299VERSION = @VERSION@ 
    318300WORDS_BIGENDIAN_FALSE = @WORDS_BIGENDIAN_FALSE@ 
  • coliny/trunk/test/Makefile.in

    r2095 r2096  
    9292AMDEP_FALSE = @AMDEP_FALSE@ 
    9393AMDEP_TRUE = @AMDEP_TRUE@ 
    94 AMPL_DIR = @AMPL_DIR@ 
    9594AMTAR = @AMTAR@ 
    96 APPSPACK_DIR = @APPSPACK_DIR@ 
    9795AUTOCONF = @AUTOCONF@ 
    9896AUTOHEADER = @AUTOHEADER@ 
     
    165163CCDEPMODE = @CCDEPMODE@ 
    166164CFLAGS = @CFLAGS@ 
    167 COIN_DIR = @COIN_DIR@ 
    168 COLINY_DIR = @COLINY_DIR@ 
    169 COLIN_DIR = @COLIN_DIR@ 
    170165CPPFLAGS = @CPPFLAGS@ 
    171166CXX = @CXX@ 
     
    180175ECHO_T = @ECHO_T@ 
    181176EGREP = @EGREP@ 
    182 EXACT_DIR = @EXACT_DIR@ 
    183177EXEEXT = @EXEEXT@ 
    184178F77 = @F77@ 
    185179FFLAGS = @FFLAGS@ 
    186 FILIB_DIR = @FILIB_DIR@ 
    187180FLIBS = @FLIBS@ 
    188 GLPK_DIR = @GLPK_DIR@ 
    189 GNLP_DIR = @GNLP_DIR@ 
    190181HAVE_ANSI_CPP_HEADERS_FALSE = @HAVE_ANSI_CPP_HEADERS_FALSE@ 
    191182HAVE_ANSI_CPP_HEADERS_TRUE = @HAVE_ANSI_CPP_HEADERS_TRUE@ 
     
    212203INSTALL_SCRIPT = @INSTALL_SCRIPT@ 
    213204INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 
    214 IPOPT_DIR = @IPOPT_DIR@ 
    215205LAPACK_LIBS = @LAPACK_LIBS@ 
    216206LDFLAGS = @LDFLAGS@ 
     
    233223MPI_LIBDIR = @MPI_LIBDIR@ 
    234224MPI_LIBS = @MPI_LIBS@ 
    235 MTL_DIR = @MTL_DIR@ 
    236225OBJEXT = @OBJEXT@ 
    237226PACKAGE = @PACKAGE@ 
     
    241230PACKAGE_TARNAME = @PACKAGE_TARNAME@ 
    242231PACKAGE_VERSION = @PACKAGE_VERSION@ 
    243 PARPCX_DIR = @PARPCX_DIR@ 
    244232PATH_SEPARATOR = @PATH_SEPARATOR@ 
    245 PICOCORE_DIR = @PICOCORE_DIR@ 
    246 PICOMILP_DIR = @PICOMILP_DIR@ 
    247 PLS_DIR = @PLS_DIR@ 
    248233RANLIB = @RANLIB@ 
    249234RECONFIGURE_MTL_FALSE = @RECONFIGURE_MTL_FALSE@ 
     
    251236SET_MAKE = @SET_MAKE@ 
    252237SHELL = @SHELL@ 
    253 SOPLEX_DIR = @SOPLEX_DIR@ 
    254238STRIP = @STRIP@ 
    255239TARGET_CYGWIN_FALSE = @TARGET_CYGWIN_FALSE@ 
     
    261245TARGET_SOLARIS_FALSE = @TARGET_SOLARIS_FALSE@ 
    262246TARGET_SOLARIS_TRUE = @TARGET_SOLARIS_TRUE@ 
    263 THREEPO_DIR = @THREEPO_DIR@ 
    264247TPL_DIR = @TPL_DIR@ 
    265248USE_MPI_CC_FALSE = @USE_MPI_CC_FALSE@ 
     
    269252USE_MPI_F77_FALSE = @USE_MPI_F77_FALSE@ 
    270253USE_MPI_F77_TRUE = @USE_MPI_F77_TRUE@ 
    271 UTILIB_DIR = @UTILIB_DIR@ 
    272254VERSION = @VERSION@ 
    273255WORDS_BIGENDIAN_FALSE = @WORDS_BIGENDIAN_FALSE@ 
Note: See TracChangeset for help on using the changeset viewer.