Changeset 102


Ignore:
Timestamp:
Apr 7, 2009 1:41:55 PM (11 years ago)
Author:
stefan
Message:

to resolve dependency of bound_tightening on libBonCouenne: add BonCouenneInfo? to libCouenneBoundTightening

Location:
trunk/Couenne/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/bound_tightening/Makefile.am

    r96 r102  
    2424        operators/impliedBounds-exprMul.cpp \
    2525        operators/impliedBounds-exprQuad.cpp \
    26         operators/impliedBounds-exprPow.cpp
     26        operators/impliedBounds-exprPow.cpp \
     27        ../main/BonCouenneInfo.cpp
    2728
    2829libCouenneBoundTightening_la_DEPENDENCIES = $(libCouenneBoundTightening_la_LIBADD)
  • trunk/Couenne/src/bound_tightening/Makefile.in

    r96 r102  
    6868        impliedBounds-sum.lo impliedBounds-exprSum.lo \
    6969        impliedBounds-exprDiv.lo impliedBounds-exprMul.lo \
    70         impliedBounds-exprQuad.lo impliedBounds-exprPow.lo
     70        impliedBounds-exprQuad.lo impliedBounds-exprPow.lo \
     71        BonCouenneInfo.lo
    7172libCouenneBoundTightening_la_OBJECTS =  \
    7273        $(am_libCouenneBoundTightening_la_OBJECTS)
     
    290291        operators/impliedBounds-exprMul.cpp \
    291292        operators/impliedBounds-exprQuad.cpp \
    292         operators/impliedBounds-exprPow.cpp
     293        operators/impliedBounds-exprPow.cpp \
     294        ../main/BonCouenneInfo.cpp
    293295
    294296libCouenneBoundTightening_la_DEPENDENCIES = $(libCouenneBoundTightening_la_LIBADD)
     
    366368        -rm -f *.tab.c
    367369
     370@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneInfo.Plo@am__quote@
    368371@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aggressiveBT.Plo@am__quote@
    369372@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boundTightening.Plo@am__quote@
     
    450453@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    451454@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o impliedBounds-exprPow.lo `test -f 'operators/impliedBounds-exprPow.cpp' || echo '$(srcdir)/'`operators/impliedBounds-exprPow.cpp
     455
     456BonCouenneInfo.lo: ../main/BonCouenneInfo.cpp
     457@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BonCouenneInfo.lo -MD -MP -MF "$(DEPDIR)/BonCouenneInfo.Tpo" -c -o BonCouenneInfo.lo `test -f '../main/BonCouenneInfo.cpp' || echo '$(srcdir)/'`../main/BonCouenneInfo.cpp; \
     458@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/BonCouenneInfo.Tpo" "$(DEPDIR)/BonCouenneInfo.Plo"; else rm -f "$(DEPDIR)/BonCouenneInfo.Tpo"; exit 1; fi
     459@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../main/BonCouenneInfo.cpp' object='BonCouenneInfo.lo' libtool=yes @AMDEPBACKSLASH@
     460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     461@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o BonCouenneInfo.lo `test -f '../main/BonCouenneInfo.cpp' || echo '$(srcdir)/'`../main/BonCouenneInfo.cpp
    452462
    453463mostlyclean-libtool:
  • trunk/Couenne/src/main/Makefile.am

    r99 r102  
    2121        BonCouenneInterface.cpp \
    2222        BonNlpHeuristic.cpp \
    23         BonCouenneInfo.cpp \
    2423        BonInitHeuristic.cpp \
    2524        CouenneOSInterface.cpp
  • trunk/Couenne/src/main/Makefile.in

    r99 r102  
    7171libBonCouenne_la_LIBADD =
    7272am_libBonCouenne_la_OBJECTS = BonCouenneSetup.lo \
    73         BonCouenneInterface.lo BonNlpHeuristic.lo BonCouenneInfo.lo \
    74         BonInitHeuristic.lo CouenneOSInterface.lo
     73        BonCouenneInterface.lo BonNlpHeuristic.lo BonInitHeuristic.lo \
     74        CouenneOSInterface.lo
    7575libBonCouenne_la_OBJECTS = $(am_libBonCouenne_la_OBJECTS)
    7676binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
     
    296296        BonCouenneInterface.cpp \
    297297        BonNlpHeuristic.cpp \
    298         BonCouenneInfo.cpp \
    299298        BonInitHeuristic.cpp \
    300299        CouenneOSInterface.cpp
     
    482481
    483482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenne.Po@am__quote@
    484 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneInfo.Plo@am__quote@
    485483@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneInterface.Plo@am__quote@
    486484@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCouenneSetup.Plo@am__quote@
Note: See TracChangeset for help on using the changeset viewer.