Ignore:
Timestamp:
Jul 18, 2009 3:29:23 PM (11 years ago)
Author:
stefan
Message:

start separating out ampl interface, needed changes in CouenneSetup? API; do not use install_sh to install ampllib (not good if directory lib did not exists before)

File:
1 edited

Legend:

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

    r191 r232  
    1212
    1313if COIN_HAS_ASL
    14   bin_PROGRAMS = couenne
     14  bin_PROGRAMS = couenne couenne2
    1515endif
    1616
     
    2121        BonCouenneInterface.cpp \
    2222        BonNlpHeuristic.cpp \
    23         BonInitHeuristic.cpp \
    24         CouenneOSInterface.cpp
     23        BonInitHeuristic.cpp
    2524
    2625COINLIBS = \
     
    6059        BonCouenne.cpp
    6160
     61couenne2_LDADD        = \
     62        libBonCouenne.la \
     63        ../readnl/libCouenneReadnl.la \
     64        ../libCouenne.la
     65
     66couenne2_DEPENDENCIES = \
     67        libBonCouenne.la \
     68        ../readnl/libCouenneReadnl.la \
     69        ../libCouenne.la
     70
     71couenne2_SOURCES = \
     72        Couenne.cpp \
     73        CouenneOSInterface.cpp
     74
    6275#       ../readnl/readnl.cpp
    6376
     
    7083        `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    7184
     85couenne2_LDADD += \
     86        $(LIBCBCCOPY) \
     87        $(COINLIBS) \
     88        $(ADDLIBS) \
     89        $(ASLLIB) \
     90        `cat $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` \
     91        `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    7292
    7393# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    7595# libraries.
    7696couenne_LDFLAGS = -rpath $(libdir)
     97couenne2_LDFLAGS = -rpath $(libdir)
    7798
    7899# Here list all include flags, relative to this "srcdir" directory.  This
     
    131152
    132153AM_CPPFLAGS += \
     154        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src` \
    133155        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
    134156        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
     
    137159        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/main` \
    138160        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/problem` \
    139         -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch`
     161        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/branch` \
     162        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/readnl`
    140163
    141164# This line is necessary to allow VPATH compilation with MS compilers
Note: See TracChangeset for help on using the changeset viewer.