Changeset 2337


Ignore:
Timestamp:
Oct 10, 2018 9:41:04 PM (12 months ago)
Author:
lou
Message:

Missed on last pair of changes in that last commit.

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

Legend:

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

    r2336 r2337  
    292292OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    293293OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     294OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
     295OSICLPLIB_DATA_PUB = @OSICLPLIB_DATA_PUB@
    294296OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
    295297OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
     298OSICLPLIB_LFLAGS_PUB = @OSICLPLIB_LFLAGS_PUB@
    296299OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
     300OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    297301OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    298302OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
  • branches/autotools-update/Clp/configure

    r2336 r2337  
    709709ac_ct_PKG_CONFIG
    710710PKG_CONFIG
     711OSICLPLIB_DATA_PUB
     712OSICLPLIB_PCFILES_PUB
     713OSICLPLIB_CFLAGS_PUB
     714OSICLPLIB_LFLAGS_PUB
    711715CLPLIB_DATA_PUB
    712716CLPLIB_PCFILES_PUB
     
    2062220626#############################################################################
    2062320627
    20624 # Initialise variables for ClpLib
     20628# Initialise variables for ClpLib and OsiClpLib
    2062520629
    2062620630
     
    2063220636
    2063320637  CLPLIB_DATA_PUB=\${datarootdir}/$PACKAGE_TARNAME
     20638
     20639
     20640
     20641  OSICLPLIB_LFLAGS_PUB="-L\${libdir} -lOsiClp"
     20642
     20643  OSICLPLIB_CFLAGS_PUB="-I\${includedir}"
     20644
     20645  OSICLPLIB_PCFILES_PUB=""
     20646
     20647  OSICLPLIB_DATA_PUB=\${datarootdir}/$PACKAGE_TARNAME
    2063420648
    2063520649
  • branches/autotools-update/Clp/configure.ac

    r2336 r2337  
    7272#############################################################################
    7373
    74 # Initialise variables for ClpLib
     74# Initialise variables for ClpLib and OsiClpLib
    7575
    7676AC_COIN_INIT_LIBVARS([ClpLib],[-L\${libdir} -lClp],[-I\${includedir}])
     77AC_COIN_INIT_LIBVARS([OsiClpLib],[-L\${libdir} -lOsiClp],[-I\${includedir}])
    7778
    7879AC_COIN_CHK_PKG(CoinUtils,[ClpLib])
  • branches/autotools-update/Clp/src/Makefile.in

    r2336 r2337  
    473473OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    474474OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     475OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
     476OSICLPLIB_DATA_PUB = @OSICLPLIB_DATA_PUB@
    475477OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
    476478OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
     479OSICLPLIB_LFLAGS_PUB = @OSICLPLIB_LFLAGS_PUB@
    477480OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
     481OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    478482OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    479483OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
  • branches/autotools-update/Clp/src/OsiClp/Makefile.in

    r2336 r2337  
    313313OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    314314OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     315OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
     316OSICLPLIB_DATA_PUB = @OSICLPLIB_DATA_PUB@
    315317OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
    316318OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
     319OSICLPLIB_LFLAGS_PUB = @OSICLPLIB_LFLAGS_PUB@
    317320OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
     321OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    318322OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    319323OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
  • branches/autotools-update/Clp/test/Makefile.in

    r2336 r2337  
    274274OSICLPLIB_CFLAGS = @OSICLPLIB_CFLAGS@
    275275OSICLPLIB_CFLAGS_NOPC = @OSICLPLIB_CFLAGS_NOPC@
     276OSICLPLIB_CFLAGS_PUB = @OSICLPLIB_CFLAGS_PUB@
     277OSICLPLIB_DATA_PUB = @OSICLPLIB_DATA_PUB@
    276278OSICLPLIB_LFLAGS = @OSICLPLIB_LFLAGS@
    277279OSICLPLIB_LFLAGS_NOPC = @OSICLPLIB_LFLAGS_NOPC@
     280OSICLPLIB_LFLAGS_PUB = @OSICLPLIB_LFLAGS_PUB@
    278281OSICLPLIB_PCFILES = @OSICLPLIB_PCFILES@
     282OSICLPLIB_PCFILES_PUB = @OSICLPLIB_PCFILES_PUB@
    279283OSICLPUNITTEST_CFLAGS = @OSICLPUNITTEST_CFLAGS@
    280284OSICLPUNITTEST_CFLAGS_NOPC = @OSICLPUNITTEST_CFLAGS_NOPC@
Note: See TracChangeset for help on using the changeset viewer.