Changeset 1024 for trunk


Ignore:
Timestamp:
Nov 26, 2013 4:45:39 AM (6 years ago)
Author:
stefan
Message:

improve on r1023 so it's actually no change when DEPENDENCY_LINKING is false

this is Tony's patch
https://projects.coin-or.org/BuildTools/attachment/ticket/105/dependencies_fix_couenne_dip.patch

Location:
trunk/Couenne/src
Files:
2 edited

Legend:

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

    r1023 r1024  
    2020
    2121# List all source files, including headers
    22 libCouenne_la_SOURCES = \
     22libCouenne_la_SOURCES =
     23if DEPENDENCY_LINKING
     24libCouenne_la_SOURCES += \
    2325        main/CouenneBab.cpp \
    2426        main/BonCouenneSetup.cpp \
    2527        main/SmartAslDestr.cpp
     28endif
    2629
    2730# List all additionally required libraries
     
    6063# "cygpath" stuff is necessary to compile with native compilers on Windows.
    6164
    62 AM_CPPFLAGS = \
     65AM_CPPFLAGS =
     66if DEPENDENCY_LINKING
     67AM_CPPFLAGS += \
    6368        -I`$(CYGPATH_W) $(srcdir)/convex` \
    6469        -I`$(CYGPATH_W) $(srcdir)/interfaces` \
     
    7681        -I`$(CYGPATH_W) $(srcdir)/bound_tightening/twoImpliedBT` \
    7782       $(COUENNELIB_CFLAGS)
     83endif
    7884
    7985#       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt` \
  • trunk/Couenne/src/Makefile.in

    r1023 r1024  
    4747build_triplet = @build@
    4848host_triplet = @host@
    49 @DEPENDENCY_LINKING_TRUE@am__append_1 = $(COUENNELIB_LIBS)
     49@DEPENDENCY_LINKING_TRUE@am__append_1 = \
     50@DEPENDENCY_LINKING_TRUE@       main/CouenneBab.cpp \
     51@DEPENDENCY_LINKING_TRUE@       main/BonCouenneSetup.cpp \
     52@DEPENDENCY_LINKING_TRUE@       main/SmartAslDestr.cpp
     53
     54@DEPENDENCY_LINKING_TRUE@am__append_2 = $(COUENNELIB_LIBS)
     55@DEPENDENCY_LINKING_TRUE@am__append_3 = \
     56@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/convex` \
     57@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/interfaces` \
     58@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/heuristics` \
     59@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/expression` \
     60@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/expression/operators` \
     61@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/expression/partial` \
     62@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/disjunctive` \
     63@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/main` \
     64@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/problem` \
     65@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/branch` \
     66@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
     67@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
     68@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/bound_tightening` \
     69@DEPENDENCY_LINKING_TRUE@       -I`$(CYGPATH_W) $(srcdir)/bound_tightening/twoImpliedBT` \
     70@DEPENDENCY_LINKING_TRUE@       $(COUENNELIB_CFLAGS)
     71
    5072
    5173# cut/sdpcuts/dsyevx_wrapper.hpp
     
    5678
    5779# ellipcuts/CouenneEllipCuts.hpp
    58 @COIN_HAS_NTY_TRUE@am__append_2 = branch/Nauty.h
     80@COIN_HAS_NTY_TRUE@am__append_4 = branch/Nauty.h
    5981subdir = src
    6082DIST_COMMON = $(am__includecoin_HEADERS_DIST) $(srcdir)/Makefile.am \
     
    92114am__DEPENDENCIES_2 =
    93115@DEPENDENCY_LINKING_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
    94 am_libCouenne_la_OBJECTS = CouenneBab.lo BonCouenneSetup.lo \
    95         SmartAslDestr.lo
     116am__libCouenne_la_SOURCES_DIST = main/CouenneBab.cpp \
     117        main/BonCouenneSetup.cpp main/SmartAslDestr.cpp
     118@DEPENDENCY_LINKING_TRUE@am__objects_1 = CouenneBab.lo \
     119@DEPENDENCY_LINKING_TRUE@       BonCouenneSetup.lo SmartAslDestr.lo
     120am_libCouenne_la_OBJECTS = $(am__objects_1)
    96121libCouenne_la_OBJECTS = $(am_libCouenne_la_OBJECTS)
    97122depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    106131        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    107132SOURCES = $(libCouenne_la_SOURCES)
    108 DIST_SOURCES = $(libCouenne_la_SOURCES)
     133DIST_SOURCES = $(am__libCouenne_la_SOURCES_DIST)
    109134am__includecoin_HEADERS_DIST = util/CouenneRootQ.hpp \
    110135        util/CouenneFunTriplets.hpp main/CouenneBab.hpp \
     
    421446
    422447# List all source files, including headers
    423 libCouenne_la_SOURCES = \
    424         main/CouenneBab.cpp \
    425         main/BonCouenneSetup.cpp \
    426         main/SmartAslDestr.cpp
    427 
     448libCouenne_la_SOURCES = $(am__append_1)
    428449
    429450# List all additionally required libraries
    430 libCouenne_la_LIBADD = $(libCouenne_la_DEPENDENCIES) $(am__append_1)
     451libCouenne_la_LIBADD = $(libCouenne_la_DEPENDENCIES) $(am__append_2)
    431452
    432453# List all dependency libraries
     
    459480# Here list all include flags, relative to this "srcdir" directory.  This
    460481# "cygpath" stuff is necessary to compile with native compilers on Windows.
    461 AM_CPPFLAGS = \
    462         -I`$(CYGPATH_W) $(srcdir)/convex` \
    463         -I`$(CYGPATH_W) $(srcdir)/interfaces` \
    464         -I`$(CYGPATH_W) $(srcdir)/heuristics` \
    465         -I`$(CYGPATH_W) $(srcdir)/expression` \
    466         -I`$(CYGPATH_W) $(srcdir)/expression/operators` \
    467         -I`$(CYGPATH_W) $(srcdir)/expression/partial` \
    468         -I`$(CYGPATH_W) $(srcdir)/disjunctive` \
    469         -I`$(CYGPATH_W) $(srcdir)/main` \
    470         -I`$(CYGPATH_W) $(srcdir)/problem` \
    471         -I`$(CYGPATH_W) $(srcdir)/branch` \
    472         -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
    473         -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
    474         -I`$(CYGPATH_W) $(srcdir)/bound_tightening` \
    475         -I`$(CYGPATH_W) $(srcdir)/bound_tightening/twoImpliedBT` \
    476        $(COUENNELIB_CFLAGS)
    477 
     482AM_CPPFLAGS = $(am__append_3)
    478483
    479484#       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt` \
     
    553558        cut/sdpcuts/CouenneSdpCuts.hpp cut/sdpcuts/CouennePSDcon.hpp \
    554559        cut/sdpcuts/CouenneMatrix.hpp \
    555         cut/crossconv/CouenneCrossConv.hpp $(am__append_2)
     560        cut/crossconv/CouenneCrossConv.hpp $(am__append_4)
    556561all: config.h config_couenne.h
    557562        $(MAKE) $(AM_MAKEFLAGS) all-am
Note: See TracChangeset for help on using the changeset viewer.