Ignore:
Timestamp:
Dec 16, 2013 9:57:22 AM (6 years ago)
Author:
tkr
Message:

Syncing with trunk at r2006

Location:
stable/1.15/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/Makefile.am

    r1968 r2007  
    154154        ClpMain.cpp \
    155155        CbcOrClpParam.cpp CbcOrClpParam.hpp \
     156        Clp_ampl.cpp Clp_ampl.h \
    156157        MyEventHandler.cpp MyEventHandler.hpp \
    157158        MyMessageHandler.cpp MyMessageHandler.hpp \
     
    159160
    160161# List all additionally required libraries
    161 clp_LDADD = libClp.la $(CLPLIB_LIBS)
     162clp_LDADD = libClp.la $(CLPLIB_LIBS) $(ASL_LIBS)
    162163
    163164# List all dependency libraries (similar to LDADD, but without -l, -L flags)
Note: See TracChangeset for help on using the changeset viewer.