Changeset 1665


Ignore:
Timestamp:
Jun 10, 2011 1:42:16 PM (8 years ago)
Author:
stefan
Message:

do not set rpath for executables, since libtool seem to do it anyway

Location:
trunk/Cbc
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Cbc/src/Makefile.am

    r1660 r1665  
    130130cbc_DEPENDENCIES = libCbcSolver.la libCbc.la $(CBCLIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    131131
    132 # Finally, the -rpath flag is used by libtool to make sure that the shared
    133 # library is found (in the lib install directory) when we are using dynamic
    134 # libraries.
    135 cbc_LDFLAGS = -rpath $(libdir)
    136 
    137132endif
    138133
    … …  
    170165
    171166AM_CPPFLAGS += $(DYLP_CFLAGS) $(GLPK_CFLAGS) $(MSK_CFLAGS) $(SPX_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS)
    172 
    173 # Finally, the -rpath flag is used by libtool to make sure that the shared
    174 # library is found (in the lib install directory) when we are using dynamic
    175 # libraries.
    176 
    177 cbc_generic_LDFLAGS = -rpath $(libdir)
    178167
    179168endif

  • trunk/Cbc/src/Makefile.in

    r1660 r1665  
    622622@COIN_HAS_CLP_TRUE@cbc_DEPENDENCIES = libCbcSolver.la libCbc.la $(CBCLIB_DEPENDENCIES) $(ASL_DEPENDENCIES)
    623623
    624 # Finally, the -rpath flag is used by libtool to make sure that the shared
    625 # library is found (in the lib install directory) when we are using dynamic
    626 # libraries.
    627 @COIN_HAS_CLP_TRUE@cbc_LDFLAGS = -rpath $(libdir)
    628 
    629624# List all source files for this executable, including headers
    630625@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_SOURCES = \
    … …  
    641636@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDADD = libCbcSolver.la libCbc.la $(CBCGENERIC_LIBS)
    642637@CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_DEPENDENCIES = libCbcSolver.la libCbc.la $(CBCGENERIC_DEPENDENCIES)
    643 
    644 # Finally, the -rpath flag is used by libtool to make sure that the shared
    645 # library is found (in the lib install directory) when we are using dynamic
    646 # libraries.
    647 @CBC_BUILD_CBC_GENERIC_TRUE@cbc_generic_LDFLAGS = -rpath $(libdir)
    648638
    649639# This line is necessary to allow VPATH compilation

  • trunk/Cbc/test/Makefile.am

    r1660 r1665  
    6262gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
    6363gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
    64 gamsTest_LDFLAGS = -rpath $(libdir)
    6564
    6665AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS)

  • trunk/Cbc/test/Makefile.in

    r1660 r1665  
    418418gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
    419419gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_DEPENDENCIES)
    420 gamsTest_LDFLAGS = -rpath $(libdir)
    421420AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS) \
    422421        $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) \
Note: See TracChangeset for help on using the changeset viewer.