Ignore:
Timestamp:
Dec 4, 2010 11:07:00 AM (9 years ago)
Author:
stefan
Message:

list .la files in xxx-uninstalled.pc files; setup binary dependencies with _DEPENDENCIES variable; rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/test/Makefile.in

    r1541 r1545  
    5050@COIN_HAS_NETLIB_TRUE@am__append_6 = -netlibDir=`$(CYGPATH_W) $(NETLIB_DATA)` -testOsiSolverInterface
    5151bin_PROGRAMS = gamsTest$(EXEEXT) osiUnitTest$(EXEEXT)
    52 @COIN_HAS_CLP_TRUE@am__append_7 = $(CLP_CFLAGS)
    53 #  gamsTest_LDADD += $(CLP_LIBS)
    54 @COIN_HAS_CPX_TRUE@am__append_8 = $(CPX_CFLAGS)
    55 #  gamsTest_LDADD += $(CPX_LIBS)
    56 @COIN_HAS_DYLP_TRUE@am__append_9 = $(DYLP_CFLAGS)
    57 #  gamsTest_LDADD += $(DYLP_LIBS)
    58 @COIN_HAS_GLPK_TRUE@am__append_10 = $(GLPK_CFLAGS)
    59 #  gamsTest_LDADD += $(GLPK_LIBS)
    60 @COIN_HAS_MSK_TRUE@am__append_11 = $(MSK_CFLAGS)
    61 #  gamsTest_LDADD += $(MSK_LIBS)
    62 
    63 # if COIN_HAS_SPX
    64 #   AM_CPPFLAGS += $(SPX_CFLAGS)
    65 #   gamsTest_LDADD += $(SPX_LIBS)
    66 # endif
    67 @COIN_HAS_VOL_TRUE@am__append_12 = $(VOL_CFLAGS)
    68 #  gamsTest_LDADD += $(VOL_LIBS)
    69 @COIN_HAS_XPR_TRUE@am__append_13 = $(XPR_CFLAGS)
    7052subdir = test
    7153DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    8466gamsTest_OBJECTS = $(am_gamsTest_OBJECTS)
    8567am__DEPENDENCIES_1 =
    86 gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la \
    87         $(am__DEPENDENCIES_1)
    8868am_osiUnitTest_OBJECTS = osiUnitTest.$(OBJEXT) \
    8969        OsiCbcSolverInterfaceTest.$(OBJEXT)
    9070osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
    91 osiUnitTest_DEPENDENCIES = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    92         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
    9371DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    9472depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    11997AR = @AR@
    12098ASL_CFLAGS = @ASL_CFLAGS@
     99ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
    121100ASL_DATA = @ASL_DATA@
    122101ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
     102ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
    123103ASL_LIBS = @ASL_LIBS@
     104ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
    124105AUTOCONF = @AUTOCONF@
    125106AUTOHEADER = @AUTOHEADER@
     
    130111CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
    131112CBCGENERIC_CFLAGS_INSTALLED = @CBCGENERIC_CFLAGS_INSTALLED@
     113CBCGENERIC_DEPENDENCIES = @CBCGENERIC_DEPENDENCIES@
    132114CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
    133115CBCGENERIC_LIBS_INSTALLED = @CBCGENERIC_LIBS_INSTALLED@
     
    136118CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    137119CBCLIB_CFLAGS_INSTALLED = @CBCLIB_CFLAGS_INSTALLED@
     120CBCLIB_DEPENDENCIES = @CBCLIB_DEPENDENCIES@
    138121CBCLIB_LIBS = @CBCLIB_LIBS@
    139122CBCLIB_LIBS_INSTALLED = @CBCLIB_LIBS_INSTALLED@
     
    148131CFLAGS = @CFLAGS@
    149132CLP_CFLAGS = @CLP_CFLAGS@
     133CLP_CFLAGS_INSTALLED = @CLP_CFLAGS_INSTALLED@
    150134CLP_DATA = @CLP_DATA@
    151135CLP_DATA_INSTALLED = @CLP_DATA_INSTALLED@
     136CLP_DEPENDENCIES = @CLP_DEPENDENCIES@
    152137CLP_LIBS = @CLP_LIBS@
     138CLP_LIBS_INSTALLED = @CLP_LIBS_INSTALLED@
    153139COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
     140COINDEPEND_CFLAGS_INSTALLED = @COINDEPEND_CFLAGS_INSTALLED@
    154141COINDEPEND_DATA = @COINDEPEND_DATA@
    155142COINDEPEND_DATA_INSTALLED = @COINDEPEND_DATA_INSTALLED@
     143COINDEPEND_DEPENDENCIES = @COINDEPEND_DEPENDENCIES@
    156144COINDEPEND_LIBS = @COINDEPEND_LIBS@
     145COINDEPEND_LIBS_INSTALLED = @COINDEPEND_LIBS_INSTALLED@
    157146COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
    158147COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
     
    196185CPPFLAGS = @CPPFLAGS@
    197186CPX_CFLAGS = @CPX_CFLAGS@
     187CPX_CFLAGS_INSTALLED = @CPX_CFLAGS_INSTALLED@
    198188CPX_DATA = @CPX_DATA@
    199189CPX_DATA_INSTALLED = @CPX_DATA_INSTALLED@
     190CPX_DEPENDENCIES = @CPX_DEPENDENCIES@
    200191CPX_LIBS = @CPX_LIBS@
     192CPX_LIBS_INSTALLED = @CPX_LIBS_INSTALLED@
    201193CXX = @CXX@
    202194CXXCPP = @CXXCPP@
     
    210202DEPDIR = @DEPDIR@
    211203DYLP_CFLAGS = @DYLP_CFLAGS@
     204DYLP_CFLAGS_INSTALLED = @DYLP_CFLAGS_INSTALLED@
    212205DYLP_DATA = @DYLP_DATA@
    213206DYLP_DATA_INSTALLED = @DYLP_DATA_INSTALLED@
     207DYLP_DEPENDENCIES = @DYLP_DEPENDENCIES@
    214208DYLP_LIBS = @DYLP_LIBS@
     209DYLP_LIBS_INSTALLED = @DYLP_LIBS_INSTALLED@
    215210ECHO = @ECHO@
    216211ECHO_C = @ECHO_C@
     
    223218FFLAGS = @FFLAGS@
    224219GLPK_CFLAGS = @GLPK_CFLAGS@
     220GLPK_CFLAGS_INSTALLED = @GLPK_CFLAGS_INSTALLED@
    225221GLPK_DATA = @GLPK_DATA@
    226222GLPK_DATA_INSTALLED = @GLPK_DATA_INSTALLED@
     223GLPK_DEPENDENCIES = @GLPK_DEPENDENCIES@
    227224GLPK_LIBS = @GLPK_LIBS@
     225GLPK_LIBS_INSTALLED = @GLPK_LIBS_INSTALLED@
    228226GRB_CFLAGS = @GRB_CFLAGS@
     227GRB_CFLAGS_INSTALLED = @GRB_CFLAGS_INSTALLED@
    229228GRB_DATA = @GRB_DATA@
    230229GRB_DATA_INSTALLED = @GRB_DATA_INSTALLED@
     230GRB_DEPENDENCIES = @GRB_DEPENDENCIES@
    231231GRB_LIBS = @GRB_LIBS@
     232GRB_LIBS_INSTALLED = @GRB_LIBS_INSTALLED@
    232233HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    233234HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    250251MAKEINFO = @MAKEINFO@
    251252MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
     253MIPLIB3_CFLAGS_INSTALLED = @MIPLIB3_CFLAGS_INSTALLED@
    252254MIPLIB3_DATA = @MIPLIB3_DATA@
    253255MIPLIB3_DATA_INSTALLED = @MIPLIB3_DATA_INSTALLED@
     256MIPLIB3_DEPENDENCIES = @MIPLIB3_DEPENDENCIES@
    254257MIPLIB3_LIBS = @MIPLIB3_LIBS@
     258MIPLIB3_LIBS_INSTALLED = @MIPLIB3_LIBS_INSTALLED@
    255259MPICC = @MPICC@
    256260MPICXX = @MPICXX@
    257261MSK_CFLAGS = @MSK_CFLAGS@
     262MSK_CFLAGS_INSTALLED = @MSK_CFLAGS_INSTALLED@
    258263MSK_DATA = @MSK_DATA@
    259264MSK_DATA_INSTALLED = @MSK_DATA_INSTALLED@
     265MSK_DEPENDENCIES = @MSK_DEPENDENCIES@
    260266MSK_LIBS = @MSK_LIBS@
     267MSK_LIBS_INSTALLED = @MSK_LIBS_INSTALLED@
    261268NETLIB_CFLAGS = @NETLIB_CFLAGS@
     269NETLIB_CFLAGS_INSTALLED = @NETLIB_CFLAGS_INSTALLED@
    262270NETLIB_DATA = @NETLIB_DATA@
    263271NETLIB_DATA_INSTALLED = @NETLIB_DATA_INSTALLED@
     272NETLIB_DEPENDENCIES = @NETLIB_DEPENDENCIES@
    264273NETLIB_LIBS = @NETLIB_LIBS@
     274NETLIB_LIBS_INSTALLED = @NETLIB_LIBS_INSTALLED@
    265275OBJEXT = @OBJEXT@
    266276OPT_CFLAGS = @OPT_CFLAGS@
     
    287297OSICBC_DFLT_SOLVER_XPR_TRUE = @OSICBC_DFLT_SOLVER_XPR_TRUE@
    288298OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     299OSITESTS_CFLAGS_INSTALLED = @OSITESTS_CFLAGS_INSTALLED@
    289300OSITESTS_DATA = @OSITESTS_DATA@
    290301OSITESTS_DATA_INSTALLED = @OSITESTS_DATA_INSTALLED@
     302OSITESTS_DEPENDENCIES = @OSITESTS_DEPENDENCIES@
    291303OSITESTS_LIBS = @OSITESTS_LIBS@
     304OSITESTS_LIBS_INSTALLED = @OSITESTS_LIBS_INSTALLED@
    292305PACKAGE = @PACKAGE@
    293306PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    302315RPATH_FLAGS = @RPATH_FLAGS@
    303316SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     317SAMPLE_CFLAGS_INSTALLED = @SAMPLE_CFLAGS_INSTALLED@
    304318SAMPLE_DATA = @SAMPLE_DATA@
    305319SAMPLE_DATA_INSTALLED = @SAMPLE_DATA_INSTALLED@
     320SAMPLE_DEPENDENCIES = @SAMPLE_DEPENDENCIES@
    306321SAMPLE_LIBS = @SAMPLE_LIBS@
     322SAMPLE_LIBS_INSTALLED = @SAMPLE_LIBS_INSTALLED@
    307323SET_MAKE = @SET_MAKE@
    308324SHELL = @SHELL@
    309325SPX_CFLAGS = @SPX_CFLAGS@
     326SPX_CFLAGS_INSTALLED = @SPX_CFLAGS_INSTALLED@
    310327SPX_DATA = @SPX_DATA@
    311328SPX_DATA_INSTALLED = @SPX_DATA_INSTALLED@
     329SPX_DEPENDENCIES = @SPX_DEPENDENCIES@
    312330SPX_LIBS = @SPX_LIBS@
     331SPX_LIBS_INSTALLED = @SPX_LIBS_INSTALLED@
    313332STRIP = @STRIP@
    314333VERSION = @VERSION@
    315334VOL_CFLAGS = @VOL_CFLAGS@
     335VOL_CFLAGS_INSTALLED = @VOL_CFLAGS_INSTALLED@
    316336VOL_DATA = @VOL_DATA@
    317337VOL_DATA_INSTALLED = @VOL_DATA_INSTALLED@
     338VOL_DEPENDENCIES = @VOL_DEPENDENCIES@
    318339VOL_LIBS = @VOL_LIBS@
     340VOL_LIBS_INSTALLED = @VOL_LIBS_INSTALLED@
    319341VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    320342XPR_CFLAGS = @XPR_CFLAGS@
     343XPR_CFLAGS_INSTALLED = @XPR_CFLAGS_INSTALLED@
    321344XPR_DATA = @XPR_DATA@
    322345XPR_DATA_INSTALLED = @XPR_DATA_INSTALLED@
     346XPR_DEPENDENCIES = @XPR_DEPENDENCIES@
    323347XPR_LIBS = @XPR_LIBS@
     348XPR_LIBS_INSTALLED = @XPR_LIBS_INSTALLED@
    324349abs_bin_dir = @abs_bin_dir@
    325350abs_include_dir = @abs_include_dir@
     
    393418gamsTest_SOURCES = gamsTest.cpp
    394419gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
     420gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
    395421gamsTest_LDFLAGS = -rpath $(libdir)
    396422AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS) \
    397         $(am__append_7) $(am__append_8) $(am__append_9) \
    398         $(am__append_10) $(am__append_11) $(am__append_12) \
    399         $(am__append_13) $(OSITESTS_CFLAGS) -I`$(CYGPATH_W) \
    400         $(srcdir)/../src/OsiCbc`
    401 #  gamsTest_LDADD += $(XPR_LIBS)
     423        $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) \
     424        $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS) $(OSITESTS_CFLAGS) \
     425        -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
    402426
    403427########################################################################
     
    407431osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    408432    $(CBCLIB_LIBS) $(OSITESTS_LIBS)
     433
     434osiUnitTest_DEPENDENCIES = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
     435    $(CBCLIB_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    409436
    410437
Note: See TracChangeset for help on using the changeset viewer.