Changeset 304


Ignore:
Timestamp:
Feb 22, 2010 12:39:08 PM (11 years ago)
Author:
stefan
Message:

merge chgset 257 from stable/0.2: do not recurse to readnl if no asl since empty libs confuse the builds on mac and windows

Location:
stable/0.3/Couenne
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/0.3/Couenne

  • stable/0.3/Couenne/Makefile.am

    r93 r304  
    1515SUBDIRS = \
    1616          src/util \
    17           src/expression \
    18           src/readnl \
    19           src/standardize \
     17          src/expression
     18         
     19if COIN_HAS_ASL
     20SUBDIRS += src/readnl
     21endif
     22
     23SUBDIRS += src/standardize \
    2024          src/problem \
    2125          src/bound_tightening \
  • stable/0.3/Couenne/Makefile.in

    r93 r304  
    5252build_triplet = @build@
    5353host_triplet = @host@
     54@COIN_HAS_ASL_TRUE@am__append_1 = src/readnl
    5455
    5556# We don't want to compile the test subdirectory, unless the test target is
    5657# specified.  But we need to list it as subdirectory to make sure that it is
    5758# included in the tarball
    58 @ALWAYS_FALSE@am__append_1 = test
     59@ALWAYS_FALSE@am__append_2 = test
    5960DIST_COMMON = README $(am__configure_deps) \
    6061        $(srcdir)/../BuildTools/Makemain.inc $(srcdir)/../config.guess \
     
    6465        $(srcdir)/couenne_addlibs.txt.in $(top_srcdir)/configure \
    6566        $(top_srcdir)/inc/config_couenne.h.in AUTHORS
    66 @HAVE_EXTERNALS_TRUE@am__append_2 = Externals
    67 @HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
     67@HAVE_EXTERNALS_TRUE@am__append_3 = Externals
     68@HAVE_EXTERNALS_TRUE@am__append_4 = .Externals-stamp
    6869subdir = .
    6970ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    291292#                          Subdirectories                              #
    292293########################################################################
    293 SUBDIRS = src/util src/expression src/readnl src/standardize \
     294SUBDIRS = src/util src/expression $(am__append_1) src/standardize \
    294295        src/problem src/bound_tightening src/convex src/branch \
    295         src/disjunctive src src/main $(am__append_1)
     296        src/disjunctive src src/main $(am__append_2)
    296297
    297298########################################################################
     
    300301
    301302# Here we need include all files that are not mentioned in other Makefiles
    302 EXTRA_DIST = test/grandTest.sh.in $(am__append_2)
     303EXTRA_DIST = test/grandTest.sh.in $(am__append_3)
    303304
    304305########################################################################
     
    313314
    314315# Files that are generated and should be cleaned with make distclean
    315 DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
     316DISTCLEANFILES = $(am__append_4) $(VPATH_DISTCLEANFILES)
    316317DocFiles = README AUTHORS LICENSE
    317318DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
  • stable/0.3/Couenne/src/convex

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.3/Couenne/src/main/Makefile.am

    r232 r304  
    4646        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    4747
    48 couenne_LDADD        = \
    49         libBonCouenne.la \
    50         ../readnl/libCouenneReadnl.la \
    51         ../libCouenne.la
    52 
    53 couenne_DEPENDENCIES = \
    54         libBonCouenne.la \
    55         ../readnl/libCouenneReadnl.la \
    56         ../libCouenne.la
     48couenne_LDADD         = libBonCouenne.la
     49couenne_DEPENDENCIES  = libBonCouenne.la
     50if COIN_HAS_ASL
     51couenne_LDADD        += ../readnl/libCouenneReadnl.la
     52couenne_DEPENDENCIES += ../readnl/libCouenneReadnl.la
     53endif
     54couenne_LDADD        += ../libCouenne.la
     55couenne_DEPENDENCIES += ../libCouenne.la
    5756
    5857couenne_SOURCES = \
    5958        BonCouenne.cpp
    6059
    61 couenne2_LDADD        = \
    62         libBonCouenne.la \
    63         ../readnl/libCouenneReadnl.la \
    64         ../libCouenne.la
    65 
    66 couenne2_DEPENDENCIES = \
    67         libBonCouenne.la \
    68         ../readnl/libCouenneReadnl.la \
    69         ../libCouenne.la
     60couenne2_LDADD         = libBonCouenne.la
     61couenne2_DEPENDENCIES  = libBonCouenne.la
     62if COIN_HAS_ASL
     63couenne2_LDADD        += ../readnl/libCouenneReadnl.la
     64couenne2_DEPENDENCIES += ../readnl/libCouenneReadnl.la
     65endif
     66couenne2_LDADD        += ../libCouenne.la
     67couenne2_DEPENDENCIES += ../libCouenne.la
    7068
    7169couenne2_SOURCES = \
  • stable/0.3/Couenne/src/main/Makefile.in

    r232 r304  
    4646@COIN_HAS_ASL_TRUE@bin_PROGRAMS = couenne$(EXEEXT) couenne2$(EXEEXT)
    4747@COIN_HAS_CPX_TRUE@am__append_1 = $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    48 @COIN_HAS_CPX_TRUE@am__append_2 = \
     48@COIN_HAS_ASL_TRUE@am__append_2 = ../readnl/libCouenneReadnl.la
     49@COIN_HAS_ASL_TRUE@am__append_3 = ../readnl/libCouenneReadnl.la
     50@COIN_HAS_ASL_TRUE@am__append_4 = ../readnl/libCouenneReadnl.la
     51@COIN_HAS_ASL_TRUE@am__append_5 = ../readnl/libCouenneReadnl.la
     52@COIN_HAS_CPX_TRUE@am__append_6 = \
    4953@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    5054@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(CPXINCDIR)`
     
    7781am_couenne_OBJECTS = BonCouenne.$(OBJEXT)
    7882couenne_OBJECTS = $(am_couenne_OBJECTS)
    79 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_1 =  \
     83@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_1 = ../readnl/libCouenneReadnl.la
     84@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_2 =  \
    8085@COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    81 am__DEPENDENCIES_2 = $(CBCOBJDIR)/src/libCbc.la \
     86am__DEPENDENCIES_3 = $(CBCOBJDIR)/src/libCbc.la \
    8287        $(CGLOBJDIR)/src/libCgl.la \
    8388        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     
    8691        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    8792        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    88         $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la $(am__DEPENDENCIES_1) \
     93        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la $(am__DEPENDENCIES_2) \
    8994        $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    9095        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    91 am__DEPENDENCIES_3 =
     96am__DEPENDENCIES_4 =
    9297am_couenne2_OBJECTS = Couenne.$(OBJEXT) CouenneOSInterface.$(OBJEXT)
    9398couenne2_OBJECTS = $(am_couenne2_OBJECTS)
     
    317322
    318323#       ../readnl/readnl.cpp
    319 couenne_LDADD = libBonCouenne.la ../readnl/libCouenneReadnl.la \
    320         ../libCouenne.la $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) \
    321         $(ASLLIB) `cat \
     324couenne_LDADD = libBonCouenne.la $(am__append_2) ../libCouenne.la \
     325        $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) $(ASLLIB) `cat \
    322326        $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
    323327        $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    324 couenne_DEPENDENCIES = \
    325         libBonCouenne.la \
    326         ../readnl/libCouenneReadnl.la \
     328couenne_DEPENDENCIES = libBonCouenne.la $(am__append_3) \
    327329        ../libCouenne.la
    328 
    329330couenne_SOURCES = \
    330331        BonCouenne.cpp
    331332
    332 couenne2_LDADD = libBonCouenne.la ../readnl/libCouenneReadnl.la \
    333         ../libCouenne.la $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) \
    334         $(ASLLIB) `cat \
     333couenne2_LDADD = libBonCouenne.la $(am__append_4) ../libCouenne.la \
     334        $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) $(ASLLIB) `cat \
    335335        $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
    336336        $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    337 couenne2_DEPENDENCIES = \
    338         libBonCouenne.la \
    339         ../readnl/libCouenneReadnl.la \
     337couenne2_DEPENDENCIES = libBonCouenne.la $(am__append_5) \
    340338        ../libCouenne.la
    341 
    342339couenne2_SOURCES = \
    343340        Couenne.cpp \
     
    389386        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    390387        $(CGLSRCDIR)/src/CglPreProcess` -I`$(CYGPATH_W) \
    391         $(CGLOBJDIR)/inc` $(am__append_2) $(ASL_CPPFLAGS) \
     388        $(CGLOBJDIR)/inc` $(am__append_6) $(ASL_CPPFLAGS) \
    392389        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src` -I`$(CYGPATH_W) \
    393390        $(COUENNESRCDIR)/src/convex` -I`$(CYGPATH_W) \
Note: See TracChangeset for help on using the changeset viewer.