Changeset 1603 for trunk/Clp/test


Ignore:
Timestamp:
Sep 13, 2010 3:39:27 AM (10 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
trunk/Clp/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/test/Makefile.am

    r1575 r1603  
    2121osiUnitTest_LDADD = ../src/libClp.la ../src/OsiClp/libOsiClp.la
    2222
    23 LIBS += $(COINUTILS_LIBS) $(OSI_LIBS) $(OSITESTS_LIBS)
     23LIBS += $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
    2424
    2525AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
  • trunk/Clp/test/Makefile.in

    r1581 r1603  
    4444host_triplet = @host@
    4545@COIN_HAS_OSITESTS_TRUE@noinst_PROGRAMS = osiUnitTest$(EXEEXT)
    46 @COIN_HAS_OSITESTS_TRUE@am__append_1 = $(COINUTILS_LIBS) $(OSI_LIBS) $(OSITESTS_LIBS)
     46@COIN_HAS_OSITESTS_TRUE@am__append_1 = $(CLPLIB_LIBS) $(OSICLP_LIBS) $(OSITESTS_LIBS)
    4747@COIN_HAS_SAMPLE_TRUE@am__append_2 = -dirSample `$(CYGPATH_W) $(SAMPLE_DATA)`
    4848@COIN_HAS_SAMPLE_TRUE@am__append_3 = -mpsDir=`$(CYGPATH_W) $(SAMPLE_DATA)`
     
    105105CDEFS = @CDEFS@
    106106CFLAGS = @CFLAGS@
     107CLPLIB_LIBS = @CLPLIB_LIBS@
     108CLPLIB_PCLIBS = @CLPLIB_PCLIBS@
     109CLPLIB_PCREQUIRES = @CLPLIB_PCREQUIRES@
    107110CLP_SVN_REV = @CLP_SVN_REV@
    108111COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
     
    171174OPT_CFLAGS = @OPT_CFLAGS@
    172175OPT_CXXFLAGS = @OPT_CXXFLAGS@
     176OSICLPLIB_LIBS = @OSICLPLIB_LIBS@
     177OSICLPLIB_PCLIBS = @OSICLPLIB_PCLIBS@
     178OSICLPLIB_PCREQUIRES = @OSICLPLIB_PCREQUIRES@
    173179OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    174180OSITESTS_DATA = @OSITESTS_DATA@
     
    187193PKG_CONFIG = @PKG_CONFIG@
    188194RANLIB = @RANLIB@
    189 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    190195RPATH_FLAGS = @RPATH_FLAGS@
    191196SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
Note: See TracChangeset for help on using the changeset viewer.