Changeset 1297


Ignore:
Timestamp:
Jan 29, 2020 11:03:33 AM (2 months ago)
Author:
stefan
Message:

eliminate libCouenneReadnl

  • move CouenneAmplInterface?.lo into libCouenneProblem.la, which already has other readnl files in there
  • after waiting a decade to see libCouenne independent of ASL, I think we can give up the hope and thus merge libCouenneReadnl into libCouenne
  • simplifies the dll-export business
Location:
branches/autotools-update/Couenne
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Couenne/Makefile.am

    r1293 r1297  
    2727        src/cut/crossconv \
    2828        src
    29 
    30 if COIN_HAS_ASL
    31 SUBDIRS += src/readnl
    32 endif
    3329
    3430SUBDIRS += src/main
  • branches/autotools-update/Couenne/Makefile.in

    r1293 r1297  
    108108build_triplet = @build@
    109109host_triplet = @host@
    110 @COIN_HAS_ASL_TRUE@am__append_1 = src/readnl
    111110
    112111# We don't want to compile the test subdirectory, unless the test target is
    113112# specified.  But we need to list it as subdirectory to make sure that it is
    114113# included in the tarball
    115 @ALWAYS_FALSE@am__append_2 = test
     114@ALWAYS_FALSE@am__append_1 = test
    116115subdir = .
    117116ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    214213        src/bound_tightening src/bound_tightening/twoImpliedBT \
    215214        src/convex src/branch src/disjunctive src/interfaces \
    216         src/heuristics src/cut/sdpcuts src/cut/crossconv src \
    217         src/readnl src/main test
     215        src/heuristics src/cut/sdpcuts src/cut/crossconv src src/main \
     216        test
    218217pkgdatadir = $(datadir)/$(PACKAGE_TARNAME)
    219218pkgincludedir = $(includedir)/coin-or
     
    365364        src/bound_tightening src/bound_tightening/twoImpliedBT \
    366365        src/convex src/branch src/disjunctive src/interfaces \
    367         src/heuristics src/cut/sdpcuts src/cut/crossconv src \
    368         $(am__append_1) src/main $(am__append_2)
     366        src/heuristics src/cut/sdpcuts src/cut/crossconv src src/main \
     367        $(am__append_1)
    369368
    370369########################################################################
  • branches/autotools-update/Couenne/configure

    r1295 r1297  
    2068020680# Here list all the files that configure should create (except for the
    2068120681# configuration header file)
    20682 ac_config_files="$ac_config_files Makefile test/Makefile src/main/Makefile src/bound_tightening/Makefile src/bound_tightening/twoImpliedBT/Makefile src/branch/Makefile src/convex/Makefile src/interfaces/Makefile src/heuristics/Makefile src/disjunctive/Makefile src/cut/crossconv/Makefile src/cut/sdpcuts/Makefile src/expression/Makefile src/problem/Makefile src/standardize/Makefile src/readnl/Makefile src/util/Makefile src/Makefile test/grandTest.sh couenne.pc doxydoc/doxygen.conf"
     20682ac_config_files="$ac_config_files Makefile test/Makefile src/main/Makefile src/bound_tightening/Makefile src/bound_tightening/twoImpliedBT/Makefile src/branch/Makefile src/convex/Makefile src/interfaces/Makefile src/heuristics/Makefile src/disjunctive/Makefile src/cut/crossconv/Makefile src/cut/sdpcuts/Makefile src/expression/Makefile src/problem/Makefile src/standardize/Makefile src/util/Makefile src/Makefile test/grandTest.sh couenne.pc doxydoc/doxygen.conf"
    2068320683
    2068420684
     
    2188821888    "src/problem/Makefile") CONFIG_FILES="$CONFIG_FILES src/problem/Makefile" ;;
    2188921889    "src/standardize/Makefile") CONFIG_FILES="$CONFIG_FILES src/standardize/Makefile" ;;
    21890     "src/readnl/Makefile") CONFIG_FILES="$CONFIG_FILES src/readnl/Makefile" ;;
    2189121890    "src/util/Makefile") CONFIG_FILES="$CONFIG_FILES src/util/Makefile" ;;
    2189221891    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
  • branches/autotools-update/Couenne/configure.ac

    r1295 r1297  
    119119                 src/problem/Makefile
    120120                 src/standardize/Makefile
    121                  src/readnl/Makefile
    122121                 src/util/Makefile
    123122                 src/Makefile
  • branches/autotools-update/Couenne/src/main/Makefile.am

    r1294 r1297  
    1414
    1515couenne_SOURCES = BonCouenne.cpp
    16 couenne_LDADD   = ../libCouenne.la ../readnl/libCouenneReadnl.la
     16couenne_LDADD   = ../libCouenne.la
    1717
    1818# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Couenne/src/main/Makefile.in

    r1294 r1297  
    111111am_couenne_OBJECTS = BonCouenne.$(OBJEXT)
    112112couenne_OBJECTS = $(am_couenne_OBJECTS)
    113 couenne_DEPENDENCIES = ../libCouenne.la ../readnl/libCouenneReadnl.la
     113couenne_DEPENDENCIES = ../libCouenne.la
    114114AM_V_lt = $(am__v_lt_@AM_V@)
    115115am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     
    317317AUTOMAKE_OPTIONS = foreign
    318318couenne_SOURCES = BonCouenne.cpp
    319 couenne_LDADD = ../libCouenne.la ../readnl/libCouenneReadnl.la
     319couenne_LDADD = ../libCouenne.la
    320320
    321321# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Couenne/src/problem/Makefile.am

    r1294 r1297  
    4848        ../readnl/nl2e.cpp \
    4949        ../readnl/invmap.cpp \
    50         ../readnl/readASLfg.cpp
     50        ../readnl/readASLfg.cpp \
     51        ../readnl/CouenneAmplInterface.cpp
    5152endif
    5253
     
    6061        -I$(srcdir)/../bound_tightening \
    6162        -I$(srcdir)/../branch \
    62         -I$(srcdir)/../problem \
    6363        -I$(srcdir)/../problem/depGraph \
    6464        -I$(srcdir)/../cut/sdpcuts \
     65        -I$(srcdir)/../main \
     66        -I$(srcdir)/../interfaces \
    6567        $(COUENNELIB_CFLAGS) -DCOUENNE_BUILD
     68
  • branches/autotools-update/Couenne/src/problem/Makefile.in

    r1294 r1297  
    109109@COIN_HAS_ASL_TRUE@     ../readnl/nl2e.cpp \
    110110@COIN_HAS_ASL_TRUE@     ../readnl/invmap.cpp \
    111 @COIN_HAS_ASL_TRUE@     ../readnl/readASLfg.cpp
     111@COIN_HAS_ASL_TRUE@     ../readnl/readASLfg.cpp \
     112@COIN_HAS_ASL_TRUE@     ../readnl/CouenneAmplInterface.cpp
    112113
    113114subdir = src/problem
     
    127128@COIN_HAS_ASL_TRUE@am__objects_1 = ../readnl/readnl.lo \
    128129@COIN_HAS_ASL_TRUE@     ../readnl/nl2e.lo ../readnl/invmap.lo \
    129 @COIN_HAS_ASL_TRUE@     ../readnl/readASLfg.lo
     130@COIN_HAS_ASL_TRUE@     ../readnl/readASLfg.lo \
     131@COIN_HAS_ASL_TRUE@     ../readnl/CouenneAmplInterface.lo
    130132am_libCouenneProblem_la_OBJECTS = problem.lo CouenneProblem.lo \
    131133        problemIO.lo writeAMPL.lo writeGAMS.lo writeLP.lo \
     
    156158depcomp = $(SHELL) $(top_srcdir)/depcomp
    157159am__maybe_remake_depfiles = depfiles
    158 am__depfiles_remade = ../readnl/$(DEPDIR)/invmap.Plo \
    159         ../readnl/$(DEPDIR)/nl2e.Plo ../readnl/$(DEPDIR)/readASLfg.Plo \
     160am__depfiles_remade = ../readnl/$(DEPDIR)/CouenneAmplInterface.Plo \
     161        ../readnl/$(DEPDIR)/invmap.Plo ../readnl/$(DEPDIR)/nl2e.Plo \
     162        ../readnl/$(DEPDIR)/readASLfg.Plo \
    160163        ../readnl/$(DEPDIR)/readnl.Plo \
    161164        ./$(DEPDIR)/CouenneGlobalCutOff.Plo \
     
    379382        -I$(srcdir)/../bound_tightening \
    380383        -I$(srcdir)/../branch \
    381         -I$(srcdir)/../problem \
    382384        -I$(srcdir)/../problem/depGraph \
    383385        -I$(srcdir)/../cut/sdpcuts \
     386        -I$(srcdir)/../main \
     387        -I$(srcdir)/../interfaces \
    384388        $(COUENNELIB_CFLAGS) -DCOUENNE_BUILD
    385389
     
    452456../readnl/readASLfg.lo: ../readnl/$(am__dirstamp) \
    453457        ../readnl/$(DEPDIR)/$(am__dirstamp)
     458../readnl/CouenneAmplInterface.lo: ../readnl/$(am__dirstamp) \
     459        ../readnl/$(DEPDIR)/$(am__dirstamp)
    454460
    455461libCouenneProblem.la: $(libCouenneProblem_la_OBJECTS) $(libCouenneProblem_la_DEPENDENCIES) $(EXTRA_libCouenneProblem_la_DEPENDENCIES)
     
    466472        -rm -f *.tab.c
    467473
     474@AMDEP_TRUE@@am__include@ @am__quote@../readnl/$(DEPDIR)/CouenneAmplInterface.Plo@am__quote@ # am--include-marker
    468475@AMDEP_TRUE@@am__include@ @am__quote@../readnl/$(DEPDIR)/invmap.Plo@am__quote@ # am--include-marker
    469476@AMDEP_TRUE@@am__include@ @am__quote@../readnl/$(DEPDIR)/nl2e.Plo@am__quote@ # am--include-marker
     
    625632
    626633distclean: distclean-am
    627                 -rm -f ../readnl/$(DEPDIR)/invmap.Plo
     634                -rm -f ../readnl/$(DEPDIR)/CouenneAmplInterface.Plo
     635        -rm -f ../readnl/$(DEPDIR)/invmap.Plo
    628636        -rm -f ../readnl/$(DEPDIR)/nl2e.Plo
    629637        -rm -f ../readnl/$(DEPDIR)/readASLfg.Plo
     
    695703
    696704maintainer-clean: maintainer-clean-am
    697                 -rm -f ../readnl/$(DEPDIR)/invmap.Plo
     705                -rm -f ../readnl/$(DEPDIR)/CouenneAmplInterface.Plo
     706        -rm -f ../readnl/$(DEPDIR)/invmap.Plo
    698707        -rm -f ../readnl/$(DEPDIR)/nl2e.Plo
    699708        -rm -f ../readnl/$(DEPDIR)/readASLfg.Plo
Note: See TracChangeset for help on using the changeset viewer.