Ignore:
Timestamp:
Dec 4, 2010 11:07:00 AM (9 years ago)
Author:
stefan
Message:

list .la files in xxx-uninstalled.pc files; setup binary dependencies with _DEPENDENCIES variable; rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.am

    r1531 r1545  
    105105        CbcSolverExpandKnapsack.cpp CbcSolverExpandKnapsack.hpp
    106106
    107 # This is for libtool (on Windows)
     107# This is for libtool
    108108
    109109libCbc_la_LDFLAGS = $(LT_LDFLAGS)
     
    111111
    112112# Some common setup for cbc and cbc-generic.
    113 #   ($(CPX_LIBS) should resolve in an empty string if there is no cplex)
    114113
    115114bin_PROGRAMS =
    116 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS)
     115AM_CPPFLAGS = $(COINDEPEND_CFLAGS) $(CLP_CFLAGS) $(CPX_CFLAGS) $(ASL_CFLAGS)
    117116
    118117########################################################################
     
    129128cbc_SOURCES = CoinSolve.cpp
    130129
    131 # Additional COIN libraries
    132 cbc_LDADD = libCbcSolver.la libCbc.la $(CBCLIB_LIBS)
     130# Additional libraries
     131cbc_LDADD = libCbcSolver.la libCbc.la $(CBCLIB_LIBS) $(ASL_LIBS)
     132cbc_DEPENDENCIES = libCbcSolver.la libCbc.la $(CBCLIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    133133
    134134# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    136136# libraries.
    137137cbc_LDFLAGS = -rpath $(libdir)
    138 
    139 # Add locations of include files.
    140 
    141 if COIN_HAS_ASL
    142   AM_CPPFLAGS += $(ASL_CFLAGS)
    143   cbc_LDADD += $(ASL_LIBS)
    144 endif
    145138
    146139endif
     
    172165
    173166cbc_generic_LDADD = libCbcSolver.la libCbc.la $(CBCGENERIC_LIBS)
     167cbc_generic_DEPENDENCIES = libCbcSolver.la libCbc.la $(CBCGENERIC_DEPENDENCIES)
    174168
    175169# List all additionally required solver and Osi libraries
     
    177171# so just add compiler flags here (all we can think of)
    178172
    179 AM_CPPFLAGS += $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    180 
    181 if COIN_HAS_ASL
    182   AM_CPPFLAGS += $(ASL_CFLAGS)
    183   cbc_generic_LDADD += $(ASL_LIBS)
    184 endif
     173AM_CPPFLAGS += $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    185174
    186175# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    208197
    209198# Here list all the header files that are required by a user of the library,
    210 # and that therefore should be installed in 'install/coin'
     199# and that therefore should be installed in 'include/coin'
    211200includecoindir = $(includedir)/coin
    212201includecoin_HEADERS = \
Note: See TracChangeset for help on using the changeset viewer.