Changeset 2336


Ignore:
Timestamp:
Oct 10, 2018 9:31:29 PM (20 months ago)
Author:
lou
Message:

Update configure.ac and the .pc.in files to work with INIT_LIBVARS.

Location:
branches/autotools-update/Clp
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Clp/Makefile.in

    r2334 r2336  
    232232CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    233233CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     234CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
     235CLPLIB_DATA_PUB = @CLPLIB_DATA_PUB@
    234236CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
    235237CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
     238CLPLIB_LFLAGS_PUB = @CLPLIB_LFLAGS_PUB@
    236239CLPLIB_PCFILES = @CLPLIB_PCFILES@
     240CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    237241CLP_SVN_REV = @CLP_SVN_REV@
    238242COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    393397COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    394398
    395 # Needless to say, it's important that doxydocdir_nosub not be a target for
     399# Needless to say, it's important that baredocdir_nosub not be a target for
    396400# autoconf substitution.
    397401DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
  • branches/autotools-update/Clp/clp.pc.in

    r2334 r2336  
    88URL: https://projects.coin-or.org/Clp
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lClpSolver -lClp
     10Libs: @CLPLIB_LFLAGS_PUB@
    1111Libs.private: @CLPLIB_LFLAGS_NOPC@
    12 Cflags: -I${includedir} @CLPLIB_CFLAGS_NOPC@
     12Cflags: @CLPLIB_CFLAGS_PUB@
    1313Requires:
    1414Requires.private: @CLPLIB_PCFILES@
  • branches/autotools-update/Clp/configure

    r2334 r2336  
    709709ac_ct_PKG_CONFIG
    710710PKG_CONFIG
     711CLPLIB_DATA_PUB
     712CLPLIB_PCFILES_PUB
     713CLPLIB_CFLAGS_PUB
     714CLPLIB_LFLAGS_PUB
    711715DEPENDENCY_LINKING_FALSE
    712716DEPENDENCY_LINKING_TRUE
     
    2061820622#############################################################################
    2061920623
     20624# Initialise variables for ClpLib
     20625
     20626
     20627  CLPLIB_LFLAGS_PUB="-L\${libdir} -lClp"
     20628
     20629  CLPLIB_CFLAGS_PUB="-I\${includedir}"
     20630
     20631  CLPLIB_PCFILES_PUB=""
     20632
     20633  CLPLIB_DATA_PUB=\${datarootdir}/$PACKAGE_TARNAME
     20634
     20635
     20636
    2062020637
    2062120638
     
    2420524222fi
    2420624223
    24207 # Generate a tag file name and a log file name
     24224# Generate a tag file name and a log file name.
    2420824225
    2420924226lc_pkg=`echo ${PACKAGE_NAME} | tr [A-Z] [a-z]`
     
    2422924246
    2423024247
    24231 # Process the list of project names and massage each one into the name of a
    24232 # tag file. Further substitution for @doxydocdir@ will happen during make
    24233 # install.
     24248# Process the list of project names and massage each one into the name of
     24249# a tag file. The value of coin_doxy_tagfiles is substituted for TAGFILES
     24250# in doxygen.conf.in. Further substitution for @baredocdir_nosub@ will happen
     24251# as an edit during make install. See comments in Makemain.inc.
    2423424252
    2423524253coin_doxy_tagfiles=
  • branches/autotools-update/Clp/configure.ac

    r2334 r2336  
    7171#                              COIN-OR components                           #
    7272#############################################################################
     73
     74# Initialise variables for ClpLib
     75
     76AC_COIN_INIT_LIBVARS([ClpLib],[-L\${libdir} -lClp],[-I\${includedir}])
    7377
    7478AC_COIN_CHK_PKG(CoinUtils,[ClpLib])
  • branches/autotools-update/Clp/src/Makefile.in

    r2334 r2336  
    413413CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    414414CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     415CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
     416CLPLIB_DATA_PUB = @CLPLIB_DATA_PUB@
    415417CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
    416418CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
     419CLPLIB_LFLAGS_PUB = @CLPLIB_LFLAGS_PUB@
    417420CLPLIB_PCFILES = @CLPLIB_PCFILES@
     421CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    418422CLP_SVN_REV = @CLP_SVN_REV@
    419423COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    574578COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    575579
    576 # Needless to say, it's important that doxydocdir_nosub not be a target for
     580# Needless to say, it's important that baredocdir_nosub not be a target for
    577581# autoconf substitution.
    578582DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
  • branches/autotools-update/Clp/src/OsiClp/Makefile.in

    r2334 r2336  
    253253CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    254254CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     255CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
     256CLPLIB_DATA_PUB = @CLPLIB_DATA_PUB@
    255257CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
    256258CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
     259CLPLIB_LFLAGS_PUB = @CLPLIB_LFLAGS_PUB@
    257260CLPLIB_PCFILES = @CLPLIB_PCFILES@
     261CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    258262CLP_SVN_REV = @CLP_SVN_REV@
    259263COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    414418COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    415419
    416 # Needless to say, it's important that doxydocdir_nosub not be a target for
     420# Needless to say, it's important that baredocdir_nosub not be a target for
    417421# autoconf substitution.
    418422DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
  • branches/autotools-update/Clp/src/OsiClp/osi-clp.pc.in

    r2334 r2336  
    88URL: https://projects.coin-or.org/Osi
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lOsiClp
     10Libs: @OSICLPLIB_LFLAGS_PUB@
    1111Libs.private: @OSICLPLIB_LFLAGS_NOPC@
    12 Cflags: -I${includedir} @OSICLPLIB_CFLAGS_NOPC@
     12Cflags: @OSICLPLIB_CFLAGS_PUB@
    1313Requires:
    1414Requires.private: @OSICLPLIB_PCFILES@
  • branches/autotools-update/Clp/test/Makefile.in

    r2335 r2336  
    214214CLPLIB_CFLAGS = @CLPLIB_CFLAGS@
    215215CLPLIB_CFLAGS_NOPC = @CLPLIB_CFLAGS_NOPC@
     216CLPLIB_CFLAGS_PUB = @CLPLIB_CFLAGS_PUB@
     217CLPLIB_DATA_PUB = @CLPLIB_DATA_PUB@
    216218CLPLIB_LFLAGS = @CLPLIB_LFLAGS@
    217219CLPLIB_LFLAGS_NOPC = @CLPLIB_LFLAGS_NOPC@
     220CLPLIB_LFLAGS_PUB = @CLPLIB_LFLAGS_PUB@
    218221CLPLIB_PCFILES = @CLPLIB_PCFILES@
     222CLPLIB_PCFILES_PUB = @CLPLIB_PCFILES_PUB@
    219223CLP_SVN_REV = @CLP_SVN_REV@
    220224COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
     
    375379COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    376380
    377 # Needless to say, it's important that doxydocdir_nosub not be a target for
     381# Needless to say, it's important that baredocdir_nosub not be a target for
    378382# autoconf substitution.
    379383DOXYTAG_EDIT = sed -e 's|@baredocdir_nosub@|$(datarootdir)/doc|g'
Note: See TracChangeset for help on using the changeset viewer.