Changeset 257 for stable/0.2/Couenne


Ignore:
Timestamp:
Sep 3, 2009 4:37:43 PM (11 years ago)
Author:
stefan
Message:

do not recurse to readnl if no asl since empty libs confuse the builds on mac and windows

Location:
stable/0.2/Couenne
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.2/Couenne/Makefile.am

    r93 r257  
    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.2/Couenne/Makefile.in

    r93 r257  
    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.2/Couenne/src/main/Makefile.am

    r201 r257  
    4747        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    4848
    49 couenne_LDADD        = \
    50         libBonCouenne.la \
    51         ../readnl/libCouenneReadnl.la \
    52         ../libCouenne.la
    53 
    54 couenne_DEPENDENCIES = \
    55         libBonCouenne.la \
    56         ../readnl/libCouenneReadnl.la \
    57         ../libCouenne.la
     49couenne_LDADD         = libBonCouenne.la
     50couenne_DEPENDENCIES  = libBonCouenne.la
     51if COIN_HAS_ASL
     52couenne_LDADD        += ../readnl/libCouenneReadnl.la
     53couenne_DEPENDENCIES += ../readnl/libCouenneReadnl.la
     54endif
     55couenne_LDADD        += ../libCouenne.la
     56couenne_DEPENDENCIES += ../libCouenne.la
    5857
    5958couenne_SOURCES = \
    6059        BonCouenne.cpp
    61 
    62 #       ../readnl/readnl.cpp
    6360
    6461couenne_LDADD += \
  • stable/0.2/Couenne/src/main/Makefile.in

    r201 r257  
    4646@COIN_HAS_ASL_TRUE@bin_PROGRAMS = couenne$(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_CPX_TRUE@am__append_4 = \
    4951@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx` \
    5052@COIN_HAS_CPX_TRUE@     -I`$(CYGPATH_W) $(CPXINCDIR)`
     
    7880am_couenne_OBJECTS = BonCouenne.$(OBJEXT)
    7981couenne_OBJECTS = $(am_couenne_OBJECTS)
    80 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_1 =  \
     82@COIN_HAS_ASL_TRUE@am__DEPENDENCIES_1 = ../readnl/libCouenneReadnl.la
     83@COIN_HAS_CPX_TRUE@am__DEPENDENCIES_2 =  \
    8184@COIN_HAS_CPX_TRUE@     $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    82 am__DEPENDENCIES_2 = $(CBCOBJDIR)/src/libCbc.la \
     85am__DEPENDENCIES_3 = $(CBCOBJDIR)/src/libCbc.la \
    8386        $(CGLOBJDIR)/src/libCgl.la \
    8487        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     
    8790        $(BONMINOBJDIR)/src/Interfaces/libbonmininterfaces.la \
    8891        $(IPOPTOBJDIR)/src/Interfaces/libipopt.la \
    89         $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la $(am__DEPENDENCIES_1) \
     92        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la $(am__DEPENDENCIES_2) \
    9093        $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    9194        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    92 am__DEPENDENCIES_3 =
     95am__DEPENDENCIES_4 =
    9396depcomp = $(SHELL) $(top_srcdir)/../depcomp
    9497am__depfiles_maybe = depfiles
     
    313316        $(IPOPTOBJDIR)/src/LinAlg/liblinalg.la
    314317
    315 
    316 #       ../readnl/readnl.cpp
    317 couenne_LDADD = libBonCouenne.la ../readnl/libCouenneReadnl.la \
    318         ../libCouenne.la $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) \
    319         $(ASLLIB) `cat \
     318couenne_LDADD = libBonCouenne.la $(am__append_2) ../libCouenne.la \
     319        $(LIBCBCCOPY) $(COINLIBS) $(ADDLIBS) $(ASLLIB) `cat \
    320320        $(IPOPTOBJDIR)/src/Interfaces/ipopt_addlibs_cpp.txt` `cat \
    321321        $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    322 couenne_DEPENDENCIES = \
    323         libBonCouenne.la \
    324         ../readnl/libCouenneReadnl.la \
     322couenne_DEPENDENCIES = libBonCouenne.la $(am__append_3) \
    325323        ../libCouenne.la
    326 
    327324couenne_SOURCES = \
    328325        BonCouenne.cpp
     
    371368        $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    372369        $(CGLSRCDIR)/src/CglKnapsackCover` -I`$(CYGPATH_W) \
    373         $(CGLSRCDIR)/src/CglPreProcess` $(am__append_2) \
     370        $(CGLSRCDIR)/src/CglPreProcess` $(am__append_4) \
    374371        $(ASL_CPPFLAGS) -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/convex` \
    375372        -I`$(CYGPATH_W) $(COUENNESRCDIR)/src/expression` \
Note: See TracChangeset for help on using the changeset viewer.