Ignore:
Timestamp:
Mar 10, 2010 5:47:49 PM (10 years ago)
Author:
pbelotti
Message:

re-organizing interface and heuristic files and directories

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/Makefile.am

    r305 r311  
    1818
    1919libBonCouenne_la_SOURCES = \
    20         BonCouenneSetup.cpp \
    21         BonCouenneInterface.cpp \
    22         BonNlpHeuristic.cpp \
    23         BonInitHeuristic.cpp
     20        BonCouenneSetup.cpp
    2421
    2522COINLIBS = \
     
    2926        $(BONMINOBJDIR)/src/CbcBonmin/libbonmin.la \
    3027        $(BONMINOBJDIR)/src/Algorithms/Branching/libbonbranching.la \
    31         $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    32         $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    3328        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    3429
     
    5247couenne_LDADD         = libBonCouenne.la
    5348couenne_DEPENDENCIES  = libBonCouenne.la
     49
    5450if COIN_HAS_ASL
    5551couenne_LDADD        += ../readnl/libCouenneReadnl.la
    5652couenne_DEPENDENCIES += ../readnl/libCouenneReadnl.la
     53COINLIBS             += \
     54        $(BONMINOBJDIR)/src/Interfaces/Ampl/libbonamplinterface.la \
     55        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la
    5756endif
     57
     58
     59COINLIBS += \
     60        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
     61        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la
     62
    5863couenne_LDADD        += ../libCouenne.la
    5964couenne_DEPENDENCIES += ../libCouenne.la
     
    6469couenne2_LDADD         = libBonCouenne.la
    6570couenne2_DEPENDENCIES  = libBonCouenne.la
     71
    6672if COIN_HAS_ASL
    6773couenne2_LDADD        += ../readnl/libCouenneReadnl.la
    6874couenne2_DEPENDENCIES += ../readnl/libCouenneReadnl.la
    6975endif
     76
    7077couenne2_LDADD        += ../libCouenne.la
    7178couenne2_DEPENDENCIES += ../libCouenne.la
     
    155162AM_CPPFLAGS += \
    156163        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src` \
     164        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/interfaces` \
     165        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/heuristics` \
    157166        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
    158167        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
Note: See TracChangeset for help on using the changeset viewer.