Changeset 1531 for trunk/Cbc/src


Ignore:
Timestamp:
Nov 13, 2010 2:04:20 PM (9 years ago)
Author:
tkr
Message:

Merging r1530 from stable/2.6

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Cbc

  • trunk/Cbc/src/Makefile.am

    r1501 r1531  
    9696        CbcTreeLocal.cpp CbcTreeLocal.hpp
    9797
    98 
    9998libCbcSolver_la_SOURCES = \
    10099        CbcCbcParam.cpp \
     
    115114
    116115bin_PROGRAMS =
    117 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_LIBS)
     116AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS)
    118117
    119118########################################################################
  • trunk/Cbc/src/Makefile.in

    r1516 r1531  
    558558
    559559# List additional defines
    560 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_LIBS) \
     560AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) \
    561561        $(am__append_2) $(am__append_5) $(am__append_6) \
    562562        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
Note: See TracChangeset for help on using the changeset viewer.