Changeset 2248


Ignore:
Timestamp:
Jan 29, 2020 9:40:00 AM (16 months ago)
Author:
stefan
Message:

skip LT_LDFLAGS for noinst libraries

Location:
branches/autotools-update/Bonmin
Files:
25 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Bonmin/experimental/RobotBonmin/Makefile.am

    r2222 r2248  
    2626        $(BONMINLIB_CFLAGS) $(BONMINAMPLINTERFACELIB_CFLAGS)
    2727
     28# add libtool flags
     29LDFLAGS += $(LT_LDFLAGS)
     30
    2831########################################################################
    2932#                                robotbonmin                           #
  • branches/autotools-update/Bonmin/experimental/RobotBonmin/Makefile.in

    r2229 r2248  
    233233INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    234234LD = @LD@
    235 LDFLAGS = @LDFLAGS@
     235
     236# add libtool flags
     237LDFLAGS = @LDFLAGS@ $(LT_LDFLAGS)
    236238LIBOBJS = @LIBOBJS@
    237239LIBS = @LIBS@
  • branches/autotools-update/Bonmin/experimental/Separable/Makefile.am

    r2220 r2248  
    2626        $(BONMINLIB_CFLAGS) $(BONMINAMPLINTERFACELIB_CFLAGS)
    2727
     28# add libtool flags
     29LDFLAGS += $(LT_LDFLAGS)
     30
    2831########################################################################
    2932#                                sepa                                  #
  • branches/autotools-update/Bonmin/experimental/Separable/Makefile.in

    r2229 r2248  
    235235INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    236236LD = @LD@
    237 LDFLAGS = @LDFLAGS@
     237
     238# add libtool flags
     239LDFLAGS = @LDFLAGS@ $(LT_LDFLAGS)
    238240LIBOBJS = @LIBOBJS@
    239241LIBS = @LIBS@
  • branches/autotools-update/Bonmin/src/Algorithms/Ampl/Makefile.am

    r2234 r2248  
    1818# List all source files, including headers
    1919libbonamplsetup_la_SOURCES = BonAmplSetup.cpp
    20 
    21 # This is for libtool
    22 libbonamplsetup_la_LDFLAGS = $(LT_LDFLAGS)
    2320
    2421# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Algorithms/Ampl/Makefile.in

    r2234 r2248  
    115115am__v_lt_0 = --silent
    116116am__v_lt_1 =
    117 libbonamplsetup_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    118         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    119         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonamplsetup_la_LDFLAGS) \
    120         $(LDFLAGS) -o $@
    121117AM_V_P = $(am__v_P_@AM_V@)
    122118am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    367363libbonamplsetup_la_SOURCES = BonAmplSetup.cpp
    368364
    369 # This is for libtool
    370 libbonamplsetup_la_LDFLAGS = $(LT_LDFLAGS)
    371 
    372365# Here list all include flags, relative to this "srcdir" directory.
    373366AM_CPPFLAGS = \
     
    447440
    448441libbonamplsetup.la: $(libbonamplsetup_la_OBJECTS) $(libbonamplsetup_la_DEPENDENCIES) $(EXTRA_libbonamplsetup_la_DEPENDENCIES)
    449         $(AM_V_CXXLD)$(libbonamplsetup_la_LINK)  $(libbonamplsetup_la_OBJECTS) $(libbonamplsetup_la_LIBADD) $(LIBS)
     442        $(AM_V_CXXLD)$(CXXLINK)  $(libbonamplsetup_la_OBJECTS) $(libbonamplsetup_la_LIBADD) $(LIBS)
    450443
    451444mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Algorithms/Branching/Makefile.am

    r2231 r2248  
    2323        BonLpBranchingSolver.cpp \
    2424        BonQpBranchingSolver.cpp
    25 
    26 # This is for libtool
    27 libbonbranching_la_LDFLAGS = $(LT_LDFLAGS)
    2825
    2926# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Algorithms/Branching/Makefile.in

    r2231 r2248  
    117117am__v_lt_0 = --silent
    118118am__v_lt_1 =
    119 libbonbranching_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    120         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    121         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonbranching_la_LDFLAGS) \
    122         $(LDFLAGS) -o $@
    123119AM_V_P = $(am__v_P_@AM_V@)
    124120am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    379375
    380376
    381 # This is for libtool
    382 libbonbranching_la_LDFLAGS = $(LT_LDFLAGS)
    383 
    384377# Here list all include flags, relative to this "srcdir" directory.
    385378# Currently, CbcBonmin has to be included for BonChooseVariable.hpp, but
     
    469462
    470463libbonbranching.la: $(libbonbranching_la_OBJECTS) $(libbonbranching_la_DEPENDENCIES) $(EXTRA_libbonbranching_la_DEPENDENCIES)
    471         $(AM_V_CXXLD)$(libbonbranching_la_LINK)  $(libbonbranching_la_OBJECTS) $(libbonbranching_la_LIBADD) $(LIBS)
     464        $(AM_V_CXXLD)$(CXXLINK)  $(libbonbranching_la_OBJECTS) $(libbonbranching_la_LIBADD) $(LIBS)
    472465
    473466mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Algorithms/Makefile.am

    r2231 r2248  
    3737libbonalgorithms_la_LIBADD += OaGenerators/libbonoagenerators.la
    3838libbonalgorithms_la_LIBADD += QuadCuts/libbonquadcuts.la
    39 
    40 # This is for libtool
    41 libbonalgorithms_la_LDFLAGS = $(LT_LDFLAGS)
    4239
    4340# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Algorithms/Makefile.in

    r2231 r2248  
    118118am__v_lt_0 = --silent
    119119am__v_lt_1 =
    120 libbonalgorithms_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    121         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    122         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonalgorithms_la_LDFLAGS) \
    123         $(LDFLAGS) -o $@
    124120AM_V_P = $(am__v_P_@AM_V@)
    125121am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    398394        OaGenerators/libbonoagenerators.la QuadCuts/libbonquadcuts.la
    399395
    400 # This is for libtool
    401 libbonalgorithms_la_LDFLAGS = $(LT_LDFLAGS)
    402 
    403396# Here list all include flags, relative to this "srcdir" directory.
    404397AM_CPPFLAGS = \
     
    488481
    489482libbonalgorithms.la: $(libbonalgorithms_la_OBJECTS) $(libbonalgorithms_la_DEPENDENCIES) $(EXTRA_libbonalgorithms_la_DEPENDENCIES)
    490         $(AM_V_CXXLD)$(libbonalgorithms_la_LINK)  $(libbonalgorithms_la_OBJECTS) $(libbonalgorithms_la_LIBADD) $(LIBS)
     483        $(AM_V_CXXLD)$(CXXLINK)  $(libbonalgorithms_la_OBJECTS) $(libbonalgorithms_la_LIBADD) $(LIBS)
    491484
    492485mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Algorithms/OaGenerators/Makefile.am

    r2231 r2248  
    2626        BonFpForMinlp.cpp \
    2727        BonOAMessages.cpp
    28 
    29 # This is for libtool
    30 libbonoagenerators_la_LDFLAGS = $(LT_LDFLAGS)
    3128
    3229# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Algorithms/OaGenerators/Makefile.in

    r2231 r2248  
    118118am__v_lt_0 = --silent
    119119am__v_lt_1 =
    120 libbonoagenerators_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    121         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    122         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonoagenerators_la_LDFLAGS) \
    123         $(LDFLAGS) -o $@
    124120AM_V_P = $(am__v_P_@AM_V@)
    125121am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    383379
    384380
    385 # This is for libtool
    386 libbonoagenerators_la_LDFLAGS = $(LT_LDFLAGS)
    387 
    388381# Here list all include flags, relative to this "srcdir" directory.
    389382AM_CPPFLAGS = \
     
    473466
    474467libbonoagenerators.la: $(libbonoagenerators_la_OBJECTS) $(libbonoagenerators_la_DEPENDENCIES) $(EXTRA_libbonoagenerators_la_DEPENDENCIES)
    475         $(AM_V_CXXLD)$(libbonoagenerators_la_LINK)  $(libbonoagenerators_la_OBJECTS) $(libbonoagenerators_la_LIBADD) $(LIBS)
     468        $(AM_V_CXXLD)$(CXXLINK)  $(libbonoagenerators_la_OBJECTS) $(libbonoagenerators_la_LIBADD) $(LIBS)
    476469
    477470mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Algorithms/QuadCuts/Makefile.am

    r2231 r2248  
    2626                  BonTMINLPLinObj.cpp \
    2727                  BonTMINLP2Quad.cpp
    28 
    29 # This is for libtool
    30 libbonquadcuts_la_LDFLAGS = $(LT_LDFLAGS)
    3128
    3229# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Algorithms/QuadCuts/Makefile.in

    r2231 r2248  
    117117am__v_lt_0 = --silent
    118118am__v_lt_1 =
    119 libbonquadcuts_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    120         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    121         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonquadcuts_la_LDFLAGS) \
    122         $(LDFLAGS) -o $@
    123119AM_V_P = $(am__v_P_@AM_V@)
    124120am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    380376
    381377
    382 # This is for libtool
    383 libbonquadcuts_la_LDFLAGS = $(LT_LDFLAGS)
    384 
    385378# Here list all include flags, relative to this "srcdir" directory.
    386379AM_CPPFLAGS = \
     
    482475
    483476libbonquadcuts.la: $(libbonquadcuts_la_OBJECTS) $(libbonquadcuts_la_DEPENDENCIES) $(EXTRA_libbonquadcuts_la_DEPENDENCIES)
    484         $(AM_V_CXXLD)$(libbonquadcuts_la_LINK)  $(libbonquadcuts_la_OBJECTS) $(libbonquadcuts_la_LIBADD) $(LIBS)
     477        $(AM_V_CXXLD)$(CXXLINK)  $(libbonquadcuts_la_OBJECTS) $(libbonquadcuts_la_LIBADD) $(LIBS)
    485478
    486479mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/CbcBonmin/Heuristics/Makefile.am

    r2231 r2248  
    3232       BonMilpRounding.cpp \
    3333       BonHeuristicDiveMIPVectorLength.cpp
    34 
    35 # This is for libtool
    36 libbonheuristics_la_LDFLAGS = $(LT_LDFLAGS)
    3734
    3835# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/CbcBonmin/Heuristics/Makefile.in

    r2231 r2248  
    121121am__v_lt_0 = --silent
    122122am__v_lt_1 =
    123 libbonheuristics_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    124         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    125         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonheuristics_la_LDFLAGS) \
    126         $(LDFLAGS) -o $@
    127123AM_V_P = $(am__v_P_@AM_V@)
    128124am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    401397
    402398
    403 # This is for libtool
    404 libbonheuristics_la_LDFLAGS = $(LT_LDFLAGS)
    405 
    406399# Here list all include flags, relative to this "srcdir" directory.
    407400AM_CPPFLAGS = \
     
    505498
    506499libbonheuristics.la: $(libbonheuristics_la_OBJECTS) $(libbonheuristics_la_DEPENDENCIES) $(EXTRA_libbonheuristics_la_DEPENDENCIES)
    507         $(AM_V_CXXLD)$(libbonheuristics_la_LINK)  $(libbonheuristics_la_OBJECTS) $(libbonheuristics_la_LIBADD) $(LIBS)
     500        $(AM_V_CXXLD)$(CXXLINK)  $(libbonheuristics_la_OBJECTS) $(libbonheuristics_la_LIBADD) $(LIBS)
    508501
    509502mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Interfaces/Ampl/Makefile.am

    r2234 r2248  
    2222        BonSolReader.cpp \
    2323        sos_kludge.cpp
    24 
    25 # This is for libtool
    26 libbonamplinterface_la_LDFLAGS = $(LT_LDFLAGS)
    2724
    2825# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Interfaces/Ampl/Makefile.in

    r2234 r2248  
    116116am__v_lt_0 = --silent
    117117am__v_lt_1 =
    118 libbonamplinterface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    119         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    120         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonamplinterface_la_LDFLAGS) \
    121         $(LDFLAGS) -o $@
    122118AM_V_P = $(am__v_P_@AM_V@)
    123119am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    375371
    376372
    377 # This is for libtool
    378 libbonamplinterface_la_LDFLAGS = $(LT_LDFLAGS)
    379 
    380373# Here list all include flags, relative to this "srcdir" directory.
    381374AM_CPPFLAGS = \
     
    452445
    453446libbonamplinterface.la: $(libbonamplinterface_la_OBJECTS) $(libbonamplinterface_la_DEPENDENCIES) $(EXTRA_libbonamplinterface_la_DEPENDENCIES)
    454         $(AM_V_CXXLD)$(libbonamplinterface_la_LINK)  $(libbonamplinterface_la_OBJECTS) $(libbonamplinterface_la_LIBADD) $(LIBS)
     447        $(AM_V_CXXLD)$(CXXLINK)  $(libbonamplinterface_la_OBJECTS) $(libbonamplinterface_la_LIBADD) $(LIBS)
    455448
    456449mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Interfaces/Filter/Makefile.am

    r2231 r2248  
    2626        BonFilterSolver.cpp \
    2727        BonFilterWarmStart.cpp
    28 
    29 # This is for libtool
    30 libfilterinterface_la_LDFLAGS = $(LT_LDFLAGS)
    3128
    3229# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Interfaces/Filter/Makefile.in

    r2231 r2248  
    120120am__v_lt_0 = --silent
    121121am__v_lt_1 =
    122 libfilterinterface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    123         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    124         $(AM_CXXFLAGS) $(CXXFLAGS) $(libfilterinterface_la_LDFLAGS) \
    125         $(LDFLAGS) -o $@
    126122AM_V_P = $(am__v_P_@AM_V@)
    127123am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    380376
    381377
    382 # This is for libtool
    383 libfilterinterface_la_LDFLAGS = $(LT_LDFLAGS)
    384 
    385378# Here list all include flags, relative to this "srcdir" directory.
    386379AM_CPPFLAGS = -I$(srcdir)/.. $(BONMINLIB_CFLAGS) -DBONMIN_BUILD
     
    462455
    463456libfilterinterface.la: $(libfilterinterface_la_OBJECTS) $(libfilterinterface_la_DEPENDENCIES) $(EXTRA_libfilterinterface_la_DEPENDENCIES)
    464         $(AM_V_CXXLD)$(libfilterinterface_la_LINK)  $(libfilterinterface_la_OBJECTS) $(libfilterinterface_la_LIBADD) $(LIBS)
     457        $(AM_V_CXXLD)$(CXXLINK)  $(libfilterinterface_la_OBJECTS) $(libfilterinterface_la_LIBADD) $(LIBS)
    465458
    466459mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Interfaces/Ipopt/Makefile.am

    r2231 r2248  
    2121        BonIpoptSolver.cpp \
    2222        BonIpoptWarmStart.cpp
    23 
    24 # This is for libtool
    25 libipoptinterface_la_LDFLAGS = $(LT_LDFLAGS)
    2623
    2724# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Interfaces/Ipopt/Makefile.in

    r2231 r2248  
    116116am__v_lt_0 = --silent
    117117am__v_lt_1 =
    118 libipoptinterface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    119         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    120         $(AM_CXXFLAGS) $(CXXFLAGS) $(libipoptinterface_la_LDFLAGS) \
    121         $(LDFLAGS) -o $@
    122118AM_V_P = $(am__v_P_@AM_V@)
    123119am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    374370
    375371
    376 # This is for libtool
    377 libipoptinterface_la_LDFLAGS = $(LT_LDFLAGS)
    378 
    379372# Here list all include flags, relative to this "srcdir" directory.
    380373AM_CPPFLAGS = -I$(srcdir)/.. $(BONMINLIB_CFLAGS) -DBONMIN_BUILD
     
    454447
    455448libipoptinterface.la: $(libipoptinterface_la_OBJECTS) $(libipoptinterface_la_DEPENDENCIES) $(EXTRA_libipoptinterface_la_DEPENDENCIES)
    456         $(AM_V_CXXLD)$(libipoptinterface_la_LINK)  $(libipoptinterface_la_OBJECTS) $(libipoptinterface_la_LIBADD) $(LIBS)
     449        $(AM_V_CXXLD)$(CXXLINK)  $(libipoptinterface_la_OBJECTS) $(libipoptinterface_la_LIBADD) $(LIBS)
    457450
    458451mostlyclean-compile:
  • branches/autotools-update/Bonmin/src/Interfaces/Makefile.am

    r2231 r2248  
    5050  libbonmininterfaces_la_LIBADD += Filter/libfilterinterface.la
    5151endif
    52 
    53 # This is for libtool
    54 libbonmininterfaces_la_LDFLAGS = $(LT_LDFLAGS)
    5552
    5653# Here list all include flags, relative to this "srcdir" directory.
  • branches/autotools-update/Bonmin/src/Interfaces/Makefile.in

    r2231 r2248  
    123123am__v_lt_0 = --silent
    124124am__v_lt_1 =
    125 libbonmininterfaces_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
    126         $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
    127         $(AM_CXXFLAGS) $(CXXFLAGS) $(libbonmininterfaces_la_LDFLAGS) \
    128         $(LDFLAGS) -o $@
    129125AM_V_P = $(am__v_P_@AM_V@)
    130126am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    430426        $(am__append_3)
    431427
    432 # This is for libtool
    433 libbonmininterfaces_la_LDFLAGS = $(LT_LDFLAGS)
    434 
    435428# Here list all include flags, relative to this "srcdir" directory.
    436429AM_CPPFLAGS = \
     
    574567
    575568libbonmininterfaces.la: $(libbonmininterfaces_la_OBJECTS) $(libbonmininterfaces_la_DEPENDENCIES) $(EXTRA_libbonmininterfaces_la_DEPENDENCIES)
    576         $(AM_V_CXXLD)$(libbonmininterfaces_la_LINK)  $(libbonmininterfaces_la_OBJECTS) $(libbonmininterfaces_la_LIBADD) $(LIBS)
     569        $(AM_V_CXXLD)$(CXXLINK)  $(libbonmininterfaces_la_OBJECTS) $(libbonmininterfaces_la_LIBADD) $(LIBS)
    577570
    578571mostlyclean-compile:
  • branches/autotools-update/Bonmin/test/Makefile.am

    r2220 r2248  
    3737
    3838# list libraries that need to be linked in
    39 CppExample_LDADD        = ../src/CbcBonmin/libbonmin.la
     39CppExample_LDADD = ../src/CbcBonmin/libbonmin.la
    4040
    4141#########################################################################
Note: See TracChangeset for help on using the changeset viewer.