Ignore:
Timestamp:
Dec 16, 2013 11:27:56 AM (6 years ago)
Author:
tkr
Message:

Reverse merging r2007. Ignore the commit message on that one. I made a mistake

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

    r2007 r2009  
    256256PROGRAMS = $(bin_PROGRAMS)
    257257am_clp_OBJECTS = ClpMain.$(OBJEXT) CbcOrClpParam.$(OBJEXT) \
    258         Clp_ampl.$(OBJEXT) MyEventHandler.$(OBJEXT) \
    259         MyMessageHandler.$(OBJEXT) unitTest.$(OBJEXT)
     258        MyEventHandler.$(OBJEXT) MyMessageHandler.$(OBJEXT) \
     259        unitTest.$(OBJEXT)
    260260clp_OBJECTS = $(am_clp_OBJECTS)
    261261am__DEPENDENCIES_1 =
     
    324324AMTAR = @AMTAR@
    325325AR = @AR@
    326 ASL_CFLAGS = @ASL_CFLAGS@
    327 ASL_CFLAGS_INSTALLED = @ASL_CFLAGS_INSTALLED@
    328 ASL_DATA = @ASL_DATA@
    329 ASL_DATA_INSTALLED = @ASL_DATA_INSTALLED@
    330 ASL_DEPENDENCIES = @ASL_DEPENDENCIES@
    331 ASL_LIBS = @ASL_LIBS@
    332 ASL_LIBS_INSTALLED = @ASL_LIBS_INSTALLED@
    333326AUTOCONF = @AUTOCONF@
    334327AUTOHEADER = @AUTOHEADER@
     
    373366COIN_HAS_AMD_FALSE = @COIN_HAS_AMD_FALSE@
    374367COIN_HAS_AMD_TRUE = @COIN_HAS_AMD_TRUE@
    375 COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    376 COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    377368COIN_HAS_BLAS_FALSE = @COIN_HAS_BLAS_FALSE@
    378369COIN_HAS_BLAS_TRUE = @COIN_HAS_BLAS_TRUE@
     
    630621        ClpMain.cpp \
    631622        CbcOrClpParam.cpp CbcOrClpParam.hpp \
    632         Clp_ampl.cpp Clp_ampl.h \
    633623        MyEventHandler.cpp MyEventHandler.hpp \
    634624        MyMessageHandler.cpp MyMessageHandler.hpp \
     
    637627
    638628# List all additionally required libraries
    639 clp_LDADD = libClp.la $(CLPLIB_LIBS) $(ASL_LIBS)
     629clp_LDADD = libClp.la $(CLPLIB_LIBS)
    640630
    641631# List all dependency libraries (similar to LDADD, but without -l, -L flags)
     
    873863@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClpSolve.Plo@am__quote@
    874864@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clp_C_Interface.Plo@am__quote@
    875 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clp_ampl.Po@am__quote@
    876865@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinAbcBaseFactorization1.Plo@am__quote@
    877866@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoinAbcBaseFactorization2.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.