Ignore:
Timestamp:
Nov 15, 2012 12:52:44 PM (7 years ago)
Author:
stefan
Message:

scip 3.0 brings its own cppad, no need to check for it

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SCIP/trunk/Makefile.in

    r2581 r2616  
    6767@COIN_HAS_IPOPT_TRUE@am__append_9 = scip/src/nlpi/nlpi_ipopt.cpp
    6868@COIN_HAS_IPOPT_FALSE@am__append_10 = scip/src/nlpi/nlpi_ipopt_dummy.c
    69 
    70 # use CppAD for expression evaluation, if available
    71 @COIN_HAS_CPPAD_TRUE@am__append_11 = scip/src/nlpi/exprinterpret_cppad.cpp
    72 @COIN_HAS_CPPAD_FALSE@am__append_12 = scip/src/nlpi/exprinterpret_none.c
    7369DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
    7470        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
     
    7975        compile config.guess config.sub depcomp install-sh ltmain.sh \
    8076        missing
    81 @HAVE_EXTERNALS_TRUE@am__append_13 = Dependencies
    82 @HAVE_EXTERNALS_TRUE@am__append_14 = .Dependencies-stamp
     77@HAVE_EXTERNALS_TRUE@am__append_11 = Dependencies
     78@HAVE_EXTERNALS_TRUE@am__append_12 = .Dependencies-stamp
    8379subdir = .
    8480ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    209205        scip/src/blockmemshell/memory.c scip/src/nlpi/expr.c \
    210206        scip/src/nlpi/nlpi.c scip/src/nlpi/nlpioracle.c \
     207        scip/src/nlpi/exprinterpret_cppad.cpp \
    211208        scip/src/dijkstra/dijkstra.c scip/src/xml/xmlparse.c \
    212209        scip/src/scip/lpi_spx.cpp scip/src/scip/lpi_clp.cpp \
     
    214211        scip/src/scip/lpi_xprs.c scip/src/scip/lpi_grb.c \
    215212        scip/src/scip/lpi_qso.c scip/src/scip/lpi_none.c \
    216         scip/src/nlpi/nlpi_ipopt.cpp scip/src/nlpi/nlpi_ipopt_dummy.c \
    217         scip/src/nlpi/exprinterpret_cppad.cpp \
    218         scip/src/nlpi/exprinterpret_none.c
     213        scip/src/nlpi/nlpi_ipopt.cpp scip/src/nlpi/nlpi_ipopt_dummy.c
    219214@SCIPLPI_SPX_TRUE@am__objects_1 = lpi_spx.lo
    220215@SCIPLPI_CLP_TRUE@am__objects_2 = lpi_clp.lo
     
    227222@COIN_HAS_IPOPT_TRUE@am__objects_9 = nlpi_ipopt.lo
    228223@COIN_HAS_IPOPT_FALSE@am__objects_10 = nlpi_ipopt_dummy.lo
    229 @COIN_HAS_CPPAD_TRUE@am__objects_11 = exprinterpret_cppad.lo
    230 @COIN_HAS_CPPAD_FALSE@am__objects_12 = exprinterpret_none.lo
    231224am_libcoinscip_la_OBJECTS = bitencode.lo branch.lo buffer.lo clock.lo \
    232225        conflict.lo cons.lo cutpool.lo debug.lo dialog.lo disp.lo \
     
    279272        sepa_strongcg.lo sepa_zerohalf.lo tclique_branch.lo \
    280273        tclique_coloring.lo tclique_graph.lo memory.lo expr.lo nlpi.lo \
    281         nlpioracle.lo dijkstra.lo xmlparse.lo $(am__objects_1) \
    282         $(am__objects_2) $(am__objects_3) $(am__objects_4) \
    283         $(am__objects_5) $(am__objects_6) $(am__objects_7) \
    284         $(am__objects_8) $(am__objects_9) $(am__objects_10) \
    285         $(am__objects_11) $(am__objects_12)
     274        nlpioracle.lo exprinterpret_cppad.lo dijkstra.lo xmlparse.lo \
     275        $(am__objects_1) $(am__objects_2) $(am__objects_3) \
     276        $(am__objects_4) $(am__objects_5) $(am__objects_6) \
     277        $(am__objects_7) $(am__objects_8) $(am__objects_9) \
     278        $(am__objects_10)
    286279libcoinscip_la_OBJECTS = $(am_libcoinscip_la_OBJECTS)
    287280depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    359352COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    360353COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    361 COIN_HAS_CPPAD_FALSE = @COIN_HAS_CPPAD_FALSE@
    362 COIN_HAS_CPPAD_TRUE = @COIN_HAS_CPPAD_TRUE@
    363354COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    364355COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    382373COIN_PKG_CONFIG_PATH_UNINSTALLED = @COIN_PKG_CONFIG_PATH_UNINSTALLED@
    383374CPP = @CPP@
    384 CPPAD_CFLAGS = @CPPAD_CFLAGS@
    385 CPPAD_CFLAGS_INSTALLED = @CPPAD_CFLAGS_INSTALLED@
    386 CPPAD_DATA = @CPPAD_DATA@
    387 CPPAD_DATA_INSTALLED = @CPPAD_DATA_INSTALLED@
    388 CPPAD_DEPENDENCIES = @CPPAD_DEPENDENCIES@
    389 CPPAD_LIBS = @CPPAD_LIBS@
    390 CPPAD_LIBS_INSTALLED = @CPPAD_LIBS_INSTALLED@
    391375CPPFLAGS = @CPPFLAGS@
    392376CPXINCDIR = @CPXINCDIR@
     
    551535target_alias = @target_alias@
    552536AUTOMAKE_OPTIONS = foreign
    553 EXTRA_DIST = $(am__append_13)
     537EXTRA_DIST = $(am__append_11)
    554538lib_LTLIBRARIES = libcoinscip.la
    555539libcoinscip_la_SOURCES = scip/src/scip/bitencode.c \
     
    657641        scip/src/blockmemshell/memory.c scip/src/nlpi/expr.c \
    658642        scip/src/nlpi/nlpi.c scip/src/nlpi/nlpioracle.c \
     643        scip/src/nlpi/exprinterpret_cppad.cpp \
    659644        scip/src/dijkstra/dijkstra.c scip/src/xml/xmlparse.c \
    660645        $(am__append_1) $(am__append_2) $(am__append_3) \
    661646        $(am__append_4) $(am__append_5) $(am__append_6) \
    662647        $(am__append_7) $(am__append_8) $(am__append_9) \
    663         $(am__append_10) $(am__append_11) $(am__append_12)
     648        $(am__append_10)
    664649AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/scip/src` $(SCIPLIB_CFLAGS)
    665650DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
     
    930915
    931916# Files that are generated and should be cleaned with make distclean
    932 DISTCLEANFILES = $(am__append_14) $(VPATH_DISTCLEANFILES)
     917DISTCLEANFILES = $(am__append_12) $(VPATH_DISTCLEANFILES)
    933918DocFiles = README AUTHORS LICENSE
    934919DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     
    10781063@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expr.Plo@am__quote@
    10791064@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exprinterpret_cppad.Plo@am__quote@
    1080 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exprinterpret_none.Plo@am__quote@
    10811065@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileio.Plo@am__quote@
    10821066@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heur.Plo@am__quote@
     
    25352519@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nlpi_ipopt_dummy.lo `test -f 'scip/src/nlpi/nlpi_ipopt_dummy.c' || echo '$(srcdir)/'`scip/src/nlpi/nlpi_ipopt_dummy.c
    25362520
    2537 exprinterpret_none.lo: scip/src/nlpi/exprinterpret_none.c
    2538 @am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT exprinterpret_none.lo -MD -MP -MF "$(DEPDIR)/exprinterpret_none.Tpo" -c -o exprinterpret_none.lo `test -f 'scip/src/nlpi/exprinterpret_none.c' || echo '$(srcdir)/'`scip/src/nlpi/exprinterpret_none.c; \
    2539 @am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/exprinterpret_none.Tpo" "$(DEPDIR)/exprinterpret_none.Plo"; else rm -f "$(DEPDIR)/exprinterpret_none.Tpo"; exit 1; fi
    2540 @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='scip/src/nlpi/exprinterpret_none.c' object='exprinterpret_none.lo' libtool=yes @AMDEPBACKSLASH@
    2541 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    2542 @am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o exprinterpret_none.lo `test -f 'scip/src/nlpi/exprinterpret_none.c' || echo '$(srcdir)/'`scip/src/nlpi/exprinterpret_none.c
    2543 
    25442521.cpp.o:
    25452522@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     
    25632540@am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    25642541
     2542exprinterpret_cppad.lo: scip/src/nlpi/exprinterpret_cppad.cpp
     2543@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT exprinterpret_cppad.lo -MD -MP -MF "$(DEPDIR)/exprinterpret_cppad.Tpo" -c -o exprinterpret_cppad.lo `test -f 'scip/src/nlpi/exprinterpret_cppad.cpp' || echo '$(srcdir)/'`scip/src/nlpi/exprinterpret_cppad.cpp; \
     2544@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/exprinterpret_cppad.Tpo" "$(DEPDIR)/exprinterpret_cppad.Plo"; else rm -f "$(DEPDIR)/exprinterpret_cppad.Tpo"; exit 1; fi
     2545@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='scip/src/nlpi/exprinterpret_cppad.cpp' object='exprinterpret_cppad.lo' libtool=yes @AMDEPBACKSLASH@
     2546@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     2547@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o exprinterpret_cppad.lo `test -f 'scip/src/nlpi/exprinterpret_cppad.cpp' || echo '$(srcdir)/'`scip/src/nlpi/exprinterpret_cppad.cpp
     2548
    25652549lpi_spx.lo: scip/src/scip/lpi_spx.cpp
    25662550@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lpi_spx.lo -MD -MP -MF "$(DEPDIR)/lpi_spx.Tpo" -c -o lpi_spx.lo `test -f 'scip/src/scip/lpi_spx.cpp' || echo '$(srcdir)/'`scip/src/scip/lpi_spx.cpp; \
     
    25832567@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    25842568@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o nlpi_ipopt.lo `test -f 'scip/src/nlpi/nlpi_ipopt.cpp' || echo '$(srcdir)/'`scip/src/nlpi/nlpi_ipopt.cpp
    2585 
    2586 exprinterpret_cppad.lo: scip/src/nlpi/exprinterpret_cppad.cpp
    2587 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT exprinterpret_cppad.lo -MD -MP -MF "$(DEPDIR)/exprinterpret_cppad.Tpo" -c -o exprinterpret_cppad.lo `test -f 'scip/src/nlpi/exprinterpret_cppad.cpp' || echo '$(srcdir)/'`scip/src/nlpi/exprinterpret_cppad.cpp; \
    2588 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/exprinterpret_cppad.Tpo" "$(DEPDIR)/exprinterpret_cppad.Plo"; else rm -f "$(DEPDIR)/exprinterpret_cppad.Tpo"; exit 1; fi
    2589 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='scip/src/nlpi/exprinterpret_cppad.cpp' object='exprinterpret_cppad.lo' libtool=yes @AMDEPBACKSLASH@
    2590 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    2591 @am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o exprinterpret_cppad.lo `test -f 'scip/src/nlpi/exprinterpret_cppad.cpp' || echo '$(srcdir)/'`scip/src/nlpi/exprinterpret_cppad.cpp
    25922569
    25932570mostlyclean-libtool:
Note: See TracChangeset for help on using the changeset viewer.