Changeset 2414


Ignore:
Timestamp:
Nov 2, 2018 8:51:05 PM (9 months ago)
Author:
lou
Message:

Remove COIN_INIT_LIBVARS.

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

Legend:

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

    r2412 r2414  
    230230CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    231231CBCLIB_CFLAGS_NOPC = @CBCLIB_CFLAGS_NOPC@
    232 CBCLIB_CFLAGS_PUB = @CBCLIB_CFLAGS_PUB@
    233 CBCLIB_DATA_PUB = @CBCLIB_DATA_PUB@
    234232CBCLIB_LFLAGS = @CBCLIB_LFLAGS@
    235233CBCLIB_LFLAGS_NOPC = @CBCLIB_LFLAGS_NOPC@
    236 CBCLIB_LFLAGS_PUB = @CBCLIB_LFLAGS_PUB@
    237234CBCLIB_PCFILES = @CBCLIB_PCFILES@
    238 CBCLIB_PCFILES_PUB = @CBCLIB_PCFILES_PUB@
    239235CBCUNITTEST_CFLAGS = @CBCUNITTEST_CFLAGS@
    240236CBCUNITTEST_CFLAGS_NOPC = @CBCUNITTEST_CFLAGS_NOPC@
     
    293289OSICBCLIB_CFLAGS = @OSICBCLIB_CFLAGS@
    294290OSICBCLIB_CFLAGS_NOPC = @OSICBCLIB_CFLAGS_NOPC@
    295 OSICBCLIB_CFLAGS_PUB = @OSICBCLIB_CFLAGS_PUB@
    296 OSICBCLIB_DATA_PUB = @OSICBCLIB_DATA_PUB@
    297291OSICBCLIB_LFLAGS = @OSICBCLIB_LFLAGS@
    298292OSICBCLIB_LFLAGS_NOPC = @OSICBCLIB_LFLAGS_NOPC@
    299 OSICBCLIB_LFLAGS_PUB = @OSICBCLIB_LFLAGS_PUB@
    300293OSICBCLIB_PCFILES = @OSICBCLIB_PCFILES@
    301 OSICBCLIB_PCFILES_PUB = @OSICBCLIB_PCFILES_PUB@
    302294OTOOL = @OTOOL@
    303295OTOOL64 = @OTOOL64@
  • branches/autotools-update/Cbc/cbc.pc.in

    r2390 r2414  
    22exec_prefix=@exec_prefix@
    33libdir=@libdir@
    4 includedir=@includedir@/coin
     4includedir=@includedir@/coin-or
    55
    66Name: CBC
     
    88URL: https://projects.coin-or.org/Cbc
    99Version: @PACKAGE_VERSION@
    10 Libs: @CBCLIB_LFLAGS_PUB@
     10Libs: -L${libdir} -lCbcsolver -lCbc
    1111Libs.private: @CBCLIB_LFLAGS_NOPC@
    12 Cflags: @CBCLIB_CFLAGS_PUB@
    13 Requires: @CBCLIB_PCFILES_PUB@
     12Cflags: -I${includedir}
     13Requires:
    1414Requires.private: @CBCLIB_PCFILES@
  • branches/autotools-update/Cbc/configure

    r2412 r2414  
    744744ac_ct_PKG_CONFIG
    745745PKG_CONFIG
    746 OSICBCLIB_DATA_PUB
    747 OSICBCLIB_PCFILES_PUB
    748 OSICBCLIB_CFLAGS_PUB
    749 OSICBCLIB_LFLAGS_PUB
    750 CBCLIB_DATA_PUB
    751 CBCLIB_PCFILES_PUB
    752 CBCLIB_CFLAGS_PUB
    753 CBCLIB_LFLAGS_PUB
    754746LT_LDFLAGS
    755747CXXCPP
     
    1669516687
    1669616688
    16697   CBCLIB_LFLAGS_PUB="-L\${libdir} -lCbcsolver -lCbc"
    16698 
    16699   CBCLIB_CFLAGS_PUB="-I\${includedir}"
    16700 
    16701   CBCLIB_PCFILES_PUB=""
    16702 
    16703   CBCLIB_DATA_PUB=\${datarootdir}/$PACKAGE_TARNAME
    16704 
    16705 
    16706 
    16707   OSICBCLIB_LFLAGS_PUB="-L\${libdir} -lOsiCbc"
    16708 
    16709   OSICBCLIB_CFLAGS_PUB="-I\${includedir}"
    16710 
    16711   OSICBCLIB_PCFILES_PUB=""
    16712 
    16713   OSICBCLIB_DATA_PUB=\${datarootdir}/$PACKAGE_TARNAME
    16714 
    16715 
    16716 
    16717 
    1671816689
    1671916690
  • branches/autotools-update/Cbc/configure.ac

    r2391 r2414  
    5858#                            COIN-OR components                             #
    5959#############################################################################
    60 
    61 AC_COIN_INIT_LIBVARS([CbcLib],
    62         [-L\${libdir} -lCbcsolver -lCbc],[-I\${includedir}])
    63 AC_COIN_INIT_LIBVARS([OsiCbcLib],[-L\${libdir} -lOsiCbc],[-I\${includedir}])
    6460
    6561m4_foreach_w([myvar],[CoinUtils Osi Cgl Clp],
  • branches/autotools-update/Cbc/osi-cbc.pc.in

    r2390 r2414  
    88URL: https://projects.coin-or.org/Osi
    99Version: @PACKAGE_VERSION@
    10 Libs: @OSICBCLIB_LFLAGS_PUB@
     10Libs: -L${libdir} -lOsiCbc
    1111Libs.private: @OSICBCLIB_LFLAGS_NOPC@
    12 Cflags: @OSICBCLIB_CFLAGS_PUB@
    13 Requires: @OSICBCLIB_PCFILES_PUB@
     12Cflags: -I${includedir}
     13Requires:
    1414Requires.private: @OSICBCLIB_PCFILES@
  • branches/autotools-update/Cbc/src/Makefile.in

    r2412 r2414  
    342342CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    343343CBCLIB_CFLAGS_NOPC = @CBCLIB_CFLAGS_NOPC@
    344 CBCLIB_CFLAGS_PUB = @CBCLIB_CFLAGS_PUB@
    345 CBCLIB_DATA_PUB = @CBCLIB_DATA_PUB@
    346344CBCLIB_LFLAGS = @CBCLIB_LFLAGS@
    347345CBCLIB_LFLAGS_NOPC = @CBCLIB_LFLAGS_NOPC@
    348 CBCLIB_LFLAGS_PUB = @CBCLIB_LFLAGS_PUB@
    349346CBCLIB_PCFILES = @CBCLIB_PCFILES@
    350 CBCLIB_PCFILES_PUB = @CBCLIB_PCFILES_PUB@
    351347CBCUNITTEST_CFLAGS = @CBCUNITTEST_CFLAGS@
    352348CBCUNITTEST_CFLAGS_NOPC = @CBCUNITTEST_CFLAGS_NOPC@
     
    405401OSICBCLIB_CFLAGS = @OSICBCLIB_CFLAGS@
    406402OSICBCLIB_CFLAGS_NOPC = @OSICBCLIB_CFLAGS_NOPC@
    407 OSICBCLIB_CFLAGS_PUB = @OSICBCLIB_CFLAGS_PUB@
    408 OSICBCLIB_DATA_PUB = @OSICBCLIB_DATA_PUB@
    409403OSICBCLIB_LFLAGS = @OSICBCLIB_LFLAGS@
    410404OSICBCLIB_LFLAGS_NOPC = @OSICBCLIB_LFLAGS_NOPC@
    411 OSICBCLIB_LFLAGS_PUB = @OSICBCLIB_LFLAGS_PUB@
    412405OSICBCLIB_PCFILES = @OSICBCLIB_PCFILES@
    413 OSICBCLIB_PCFILES_PUB = @OSICBCLIB_PCFILES_PUB@
    414406OTOOL = @OTOOL@
    415407OTOOL64 = @OTOOL64@
  • branches/autotools-update/Cbc/src/OsiCbc/Makefile.in

    r2412 r2414  
    266266CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    267267CBCLIB_CFLAGS_NOPC = @CBCLIB_CFLAGS_NOPC@
    268 CBCLIB_CFLAGS_PUB = @CBCLIB_CFLAGS_PUB@
    269 CBCLIB_DATA_PUB = @CBCLIB_DATA_PUB@
    270268CBCLIB_LFLAGS = @CBCLIB_LFLAGS@
    271269CBCLIB_LFLAGS_NOPC = @CBCLIB_LFLAGS_NOPC@
    272 CBCLIB_LFLAGS_PUB = @CBCLIB_LFLAGS_PUB@
    273270CBCLIB_PCFILES = @CBCLIB_PCFILES@
    274 CBCLIB_PCFILES_PUB = @CBCLIB_PCFILES_PUB@
    275271CBCUNITTEST_CFLAGS = @CBCUNITTEST_CFLAGS@
    276272CBCUNITTEST_CFLAGS_NOPC = @CBCUNITTEST_CFLAGS_NOPC@
     
    329325OSICBCLIB_CFLAGS = @OSICBCLIB_CFLAGS@
    330326OSICBCLIB_CFLAGS_NOPC = @OSICBCLIB_CFLAGS_NOPC@
    331 OSICBCLIB_CFLAGS_PUB = @OSICBCLIB_CFLAGS_PUB@
    332 OSICBCLIB_DATA_PUB = @OSICBCLIB_DATA_PUB@
    333327OSICBCLIB_LFLAGS = @OSICBCLIB_LFLAGS@
    334328OSICBCLIB_LFLAGS_NOPC = @OSICBCLIB_LFLAGS_NOPC@
    335 OSICBCLIB_LFLAGS_PUB = @OSICBCLIB_LFLAGS_PUB@
    336329OSICBCLIB_PCFILES = @OSICBCLIB_PCFILES@
    337 OSICBCLIB_PCFILES_PUB = @OSICBCLIB_PCFILES_PUB@
    338330OTOOL = @OTOOL@
    339331OTOOL64 = @OTOOL64@
  • branches/autotools-update/Cbc/test/Makefile.in

    r2412 r2414  
    244244CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    245245CBCLIB_CFLAGS_NOPC = @CBCLIB_CFLAGS_NOPC@
    246 CBCLIB_CFLAGS_PUB = @CBCLIB_CFLAGS_PUB@
    247 CBCLIB_DATA_PUB = @CBCLIB_DATA_PUB@
    248246CBCLIB_LFLAGS = @CBCLIB_LFLAGS@
    249247CBCLIB_LFLAGS_NOPC = @CBCLIB_LFLAGS_NOPC@
    250 CBCLIB_LFLAGS_PUB = @CBCLIB_LFLAGS_PUB@
    251248CBCLIB_PCFILES = @CBCLIB_PCFILES@
    252 CBCLIB_PCFILES_PUB = @CBCLIB_PCFILES_PUB@
    253249CBCUNITTEST_CFLAGS = @CBCUNITTEST_CFLAGS@
    254250CBCUNITTEST_CFLAGS_NOPC = @CBCUNITTEST_CFLAGS_NOPC@
     
    307303OSICBCLIB_CFLAGS = @OSICBCLIB_CFLAGS@
    308304OSICBCLIB_CFLAGS_NOPC = @OSICBCLIB_CFLAGS_NOPC@
    309 OSICBCLIB_CFLAGS_PUB = @OSICBCLIB_CFLAGS_PUB@
    310 OSICBCLIB_DATA_PUB = @OSICBCLIB_DATA_PUB@
    311305OSICBCLIB_LFLAGS = @OSICBCLIB_LFLAGS@
    312306OSICBCLIB_LFLAGS_NOPC = @OSICBCLIB_LFLAGS_NOPC@
    313 OSICBCLIB_LFLAGS_PUB = @OSICBCLIB_LFLAGS_PUB@
    314307OSICBCLIB_PCFILES = @OSICBCLIB_PCFILES@
    315 OSICBCLIB_PCFILES_PUB = @OSICBCLIB_PCFILES_PUB@
    316308OTOOL = @OTOOL@
    317309OTOOL64 = @OTOOL64@
Note: See TracChangeset for help on using the changeset viewer.