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.am

    r1501 r1545  
    6161gamsTest_SOURCES = gamsTest.cpp
    6262gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
     63gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
    6364gamsTest_LDFLAGS = -rpath $(libdir)
    6465
    6566AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS)
    66 
    67 if COIN_HAS_CLP
    68   AM_CPPFLAGS += $(CLP_CFLAGS)
    69 #  gamsTest_LDADD += $(CLP_LIBS)
    70 endif
    71 
    72 if COIN_HAS_CPX
    73   AM_CPPFLAGS += $(CPX_CFLAGS)
    74 #  gamsTest_LDADD += $(CPX_LIBS)
    75 endif
    76 
    77 if COIN_HAS_DYLP
    78   AM_CPPFLAGS += $(DYLP_CFLAGS)
    79 #  gamsTest_LDADD += $(DYLP_LIBS)
    80 endif
    81 
    82 if COIN_HAS_GLPK
    83   AM_CPPFLAGS += $(GLPK_CFLAGS)
    84 #  gamsTest_LDADD += $(GLPK_LIBS)
    85 endif
    86 
    87 if COIN_HAS_MSK
    88   AM_CPPFLAGS += $(MSK_CFLAGS)
    89 #  gamsTest_LDADD += $(MSK_LIBS)
    90 endif
    91 
    92 # if COIN_HAS_SPX
    93 #   AM_CPPFLAGS += $(SPX_CFLAGS)
    94 #   gamsTest_LDADD += $(SPX_LIBS)
    95 # endif
    96 
    97 if COIN_HAS_VOL
    98   AM_CPPFLAGS += $(VOL_CFLAGS)
    99 #  gamsTest_LDADD += $(VOL_LIBS)
    100 endif
    101 
    102 if COIN_HAS_XPR
    103   AM_CPPFLAGS += $(XPR_CFLAGS)
    104 #  gamsTest_LDADD += $(XPR_LIBS)
    105 endif
     67AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    10668
    10769########################################################################
     
    11375osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    11476    $(CBCLIB_LIBS) $(OSITESTS_LIBS)
     77
     78osiUnitTest_DEPENDENCIES = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
     79    $(CBCLIB_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    11580
    11681AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
Note: See TracChangeset for help on using the changeset viewer.