Changeset 766 for stable/0.4


Ignore:
Timestamp:
Aug 14, 2011 7:18:22 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev765

Location:
stable/0.4
Files:
38 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4

  • stable/0.4/Couenne

  • stable/0.4/Couenne/Makefile.am

    r714 r766  
    8989else
    9090if COIN_CXX_IS_CL
    91         echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
     91        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
    9292else
    9393        echo -L@abs_lib_dir@ -lBonCouenne -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
  • stable/0.4/Couenne/Makefile.in

    r714 r766  
    853853@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    854854@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs couenne > $(addlibsdir)/couenne_addlibs.txt
    855 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
     855@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
    856856@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lBonCouenne -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
    857857
  • stable/0.4/Couenne/src/Makefile.am

    r667 r766  
    5252AM_CPPFLAGS =
    5353
    54 # AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     54# AM_CPPFLAGS = \
    5555#       -I`$(CYGPATH_W) $(srcdir)/convex` \
    5656#       -I`$(CYGPATH_W) $(srcdir)/interfaces` \
     
    6464#       -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
    6565#       -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
    66 #       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt`
     66#       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt` \
     67#       $(COUENNELIB_CFLAGS)
    6768
    6869#       -I`$(CYGPATH_W) $(srcdir)/ellipcuts`
  • stable/0.4/Couenne/src/Makefile.in

    r667 r766  
    424424AM_CPPFLAGS =
    425425
    426 # AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     426# AM_CPPFLAGS = \
    427427#       -I`$(CYGPATH_W) $(srcdir)/convex` \
    428428#       -I`$(CYGPATH_W) $(srcdir)/interfaces` \
     
    436436#       -I`$(CYGPATH_W) $(srcdir)/cut/sdpcuts` \
    437437#       -I`$(CYGPATH_W) $(srcdir)/cut/crossconv` \
    438 #       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt`
     438#       -I`$(CYGPATH_W) $(srcdir)/two_implied_bt` \
     439#       $(COUENNELIB_CFLAGS)
    439440
    440441#       -I`$(CYGPATH_W) $(srcdir)/ellipcuts`
  • stable/0.4/Couenne/src/bound_tightening/Makefile.am

    r624 r766  
    3737# Here list all include flags, relative to this "srcdir" directory.  This
    3838# "cygpath" stuff is necessary to compile with native compilers on Windows
    39 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     39AM_CPPFLAGS = \
    4040        -I`$(CYGPATH_W) $(srcdir)/..` \
    4141        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     
    4444        -I`$(CYGPATH_W) $(srcdir)/../main` \
    4545        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    46         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    47         -I`$(CYGPATH_W) $(srcdir)/../expression/operators`
     46        -I`$(CYGPATH_W) $(srcdir)/../branch` \
     47        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     48        $(COUENNELIB_CFLAGS)
    4849
    4950# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/bound_tightening/Makefile.in

    r627 r766  
    341341# Here list all include flags, relative to this "srcdir" directory.  This
    342342# "cygpath" stuff is necessary to compile with native compilers on Windows
    343 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     343AM_CPPFLAGS = \
    344344        -I`$(CYGPATH_W) $(srcdir)/..` \
    345345        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     
    348348        -I`$(CYGPATH_W) $(srcdir)/../main` \
    349349        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    350         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    351         -I`$(CYGPATH_W) $(srcdir)/../expression/operators`
     350        -I`$(CYGPATH_W) $(srcdir)/../branch` \
     351        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     352        $(COUENNELIB_CFLAGS)
    352353
    353354
  • stable/0.4/Couenne/src/bound_tightening/twoImpliedBT/Makefile.am

    r624 r766  
    2222# Here list all include flags, relative to this "srcdir" directory.  This
    2323# "cygpath" stuff is necessary to compile with native compilers on Windows
    24 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     24AM_CPPFLAGS = \
    2525        -I`$(CYGPATH_W) $(srcdir)/../..` \
    2626        -I`$(CYGPATH_W) $(srcdir)/../../expression` \
    2727        -I`$(CYGPATH_W) $(srcdir)/../../branch` \
    2828        -I`$(CYGPATH_W) $(srcdir)/../../problem` \
    29         -I`$(CYGPATH_W) $(srcdir)/../../bound_tightening`
     29        -I`$(CYGPATH_W) $(srcdir)/../../bound_tightening` \
     30        $(COUENNELIB_CFLAGS)
    3031
    3132# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/bound_tightening/twoImpliedBT/Makefile.in

    r627 r766  
    319319# Here list all include flags, relative to this "srcdir" directory.  This
    320320# "cygpath" stuff is necessary to compile with native compilers on Windows
    321 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     321AM_CPPFLAGS = \
    322322        -I`$(CYGPATH_W) $(srcdir)/../..` \
    323323        -I`$(CYGPATH_W) $(srcdir)/../../expression` \
    324324        -I`$(CYGPATH_W) $(srcdir)/../../branch` \
    325325        -I`$(CYGPATH_W) $(srcdir)/../../problem` \
    326         -I`$(CYGPATH_W) $(srcdir)/../../bound_tightening`
     326        -I`$(CYGPATH_W) $(srcdir)/../../bound_tightening` \
     327        $(COUENNELIB_CFLAGS)
    327328
    328329
  • stable/0.4/Couenne/src/branch

  • stable/0.4/Couenne/src/branch/Makefile.am

    r624 r766  
    5050# Here list all include flags, relative to this "srcdir" directory.  This
    5151# "cygpath" stuff is necessary to compile with native compilers on Windows
    52 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     52AM_CPPFLAGS = \
    5353        -I`$(CYGPATH_W) $(srcdir)/..` \
    5454        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    5757        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    5858        -I`$(CYGPATH_W) $(srcdir)/../util` \
    59         -I`$(CYGPATH_W) $(srcdir)/../standardize`
     59        -I`$(CYGPATH_W) $(srcdir)/../standardize` \
     60        $(COUENNELIB_CFLAGS)
    6061
    6162if COIN_HAS_NTY
  • stable/0.4/Couenne/src/branch/Makefile.in

    r627 r766  
    350350# Here list all include flags, relative to this "srcdir" directory.  This
    351351# "cygpath" stuff is necessary to compile with native compilers on Windows
    352 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/..` \
    353         -I`$(CYGPATH_W) $(srcdir)/../convex` -I`$(CYGPATH_W) \
    354         $(srcdir)/../expression` -I`$(CYGPATH_W) \
    355         $(srcdir)/../expression/operators` -I`$(CYGPATH_W) \
    356         $(srcdir)/../problem` -I`$(CYGPATH_W) $(srcdir)/../util` \
    357         -I`$(CYGPATH_W) $(srcdir)/../standardize` $(am__append_2)
     352AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
     353        $(srcdir)/../convex` -I`$(CYGPATH_W) $(srcdir)/../expression` \
     354        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     355        -I`$(CYGPATH_W) $(srcdir)/../problem` -I`$(CYGPATH_W) \
     356        $(srcdir)/../util` -I`$(CYGPATH_W) $(srcdir)/../standardize` \
     357        $(COUENNELIB_CFLAGS) $(am__append_2)
    358358
    359359# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/convex/Makefile.am

    r624 r766  
    4848# Here list all include flags, relative to this "srcdir" directory.  This
    4949# "cygpath" stuff is necessary to compile with native compilers on Windows
    50 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     50AM_CPPFLAGS = \
    5151        -I`$(CYGPATH_W) $(srcdir)/..` \
    5252        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
     
    5656        -I`$(CYGPATH_W) $(srcdir)/../util` \
    5757        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    58         -I`$(CYGPATH_W) $(srcdir)/../problem`
     58        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     59        $(COUENNELIB_CFLAGS)
    5960
    6061if COIN_HAS_NTY
  • stable/0.4/Couenne/src/convex/Makefile.in

    r627 r766  
    347347# Here list all include flags, relative to this "srcdir" directory.  This
    348348# "cygpath" stuff is necessary to compile with native compilers on Windows
    349 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/..` \
    350         -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` -I`$(CYGPATH_W) \
     349AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
     350        $(srcdir)/../bound_tightening` -I`$(CYGPATH_W) \
    351351        $(srcdir)/../expression` -I`$(CYGPATH_W) \
    352352        $(srcdir)/../expression/operators` -I`$(CYGPATH_W) \
    353353        $(srcdir)/../expression/operators/bounds` -I`$(CYGPATH_W) \
    354354        $(srcdir)/../util` -I`$(CYGPATH_W) $(srcdir)/../branch` \
    355         -I`$(CYGPATH_W) $(srcdir)/../problem` $(am__append_1)
     355        -I`$(CYGPATH_W) $(srcdir)/../problem` $(COUENNELIB_CFLAGS) \
     356        $(am__append_1)
    356357
    357358# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/cut/crossconv/Makefile.am

    r624 r766  
    2020# Here list all include flags, relative to this "srcdir" directory.  This
    2121# "cygpath" stuff is necessary to compile with native compilers on Windows
    22 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     22AM_CPPFLAGS = \
    2323        -I`$(CYGPATH_W) $(srcdir)/..` \
    2424        -I`$(CYGPATH_W) $(srcdir)/../../convex` \
     
    2727        -I`$(CYGPATH_W) $(srcdir)/../../expression/operators` \
    2828        -I`$(CYGPATH_W) $(srcdir)/../../main` \
    29         -I`$(CYGPATH_W) $(srcdir)/../../branch`\
    30         -I`$(CYGPATH_W) $(srcdir)/../../problem`
     29        -I`$(CYGPATH_W) $(srcdir)/../../branch` \
     30        -I`$(CYGPATH_W) $(srcdir)/../../problem` \
     31        $(COUENNELIB_CFLAGS)
    3132
    3233# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/cut/crossconv/Makefile.in

    r627 r766  
    316316# Here list all include flags, relative to this "srcdir" directory.  This
    317317# "cygpath" stuff is necessary to compile with native compilers on Windows
    318 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     318AM_CPPFLAGS = \
    319319        -I`$(CYGPATH_W) $(srcdir)/..` \
    320320        -I`$(CYGPATH_W) $(srcdir)/../../convex` \
     
    323323        -I`$(CYGPATH_W) $(srcdir)/../../expression/operators` \
    324324        -I`$(CYGPATH_W) $(srcdir)/../../main` \
    325         -I`$(CYGPATH_W) $(srcdir)/../../branch`\
    326         -I`$(CYGPATH_W) $(srcdir)/../../problem`
     325        -I`$(CYGPATH_W) $(srcdir)/../../branch` \
     326        -I`$(CYGPATH_W) $(srcdir)/../../problem` \
     327        $(COUENNELIB_CFLAGS)
    327328
    328329
  • stable/0.4/Couenne/src/cut/ellipcuts/Makefile.am

    r624 r766  
    1717# Here list all include flags, relative to this "srcdir" directory.  This
    1818# "cygpath" stuff is necessary to compile with native compilers on Windows
    19 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     19AM_CPPFLAGS = \
    2020        -I`$(CYGPATH_W) $(srcdir)/..` \
    2121        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    2323        -I`$(CYGPATH_W) $(srcdir)/../disjunctive` \
    2424        -I`$(CYGPATH_W) $(srcdir)/../branch`\
    25         -I`$(CYGPATH_W) $(srcdir)/../problem`
     25        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     26        $(COUENNELIB_CFLAGS)
    2627
    2728# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/cut/sdpcuts/Makefile.am

    r624 r766  
    3636# Here list all include flags, relative to this "srcdir" directory.  This
    3737# "cygpath" stuff is necessary to compile with native compilers on Windows
    38 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     38AM_CPPFLAGS = \
    3939        -I`$(CYGPATH_W) $(srcdir)/../..` \
    4040        -I`$(CYGPATH_W) $(srcdir)/../../convex` \
    41         -I`$(CYGPATH_W) $(srcdir)/../../problem`
     41        -I`$(CYGPATH_W) $(srcdir)/../../problem` \
     42        $(COUENNELIB_CFLAGS)
    4243
    4344if COIN_HAS_CPX
  • stable/0.4/Couenne/src/disjunctive/Makefile.am

    r624 r766  
    2626# Here list all include flags, relative to this "srcdir" directory.  This
    2727# "cygpath" stuff is necessary to compile with native compilers on Windows
    28 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     28AM_CPPFLAGS = \
    2929        -I`$(CYGPATH_W) $(srcdir)/..` \
    3030        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    3333        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
    3434        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    35         -I`$(CYGPATH_W) $(srcdir)/../problem`
     35        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     36        $(COUENNELIB_CFLAGS)
    3637
    3738# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/disjunctive/Makefile.in

    r627 r766  
    325325# Here list all include flags, relative to this "srcdir" directory.  This
    326326# "cygpath" stuff is necessary to compile with native compilers on Windows
    327 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     327AM_CPPFLAGS = \
    328328        -I`$(CYGPATH_W) $(srcdir)/..` \
    329329        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    332332        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening` \
    333333        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    334         -I`$(CYGPATH_W) $(srcdir)/../problem`
     334        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     335        $(COUENNELIB_CFLAGS)
    335336
    336337
  • stable/0.4/Couenne/src/expression/Makefile.am

    r624 r766  
    8383# Here list all include flags, relative to this "srcdir" directory.  This
    8484# "cygpath" stuff is necessary to compile with native compilers on Windows
    85 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     85AM_CPPFLAGS = \
    8686        -I`$(CYGPATH_W) $(srcdir)/..` \
    8787        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    9292        -I`$(CYGPATH_W) $(srcdir)/../standardize` \
    9393        -I`$(CYGPATH_W) $(srcdir)/../util` \
    94         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     94        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    9595        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    96         -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph`
     96        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph` \
     97        $(COUENNELIB_CFLAGS)
    9798
    9899# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/expression/Makefile.in

    r627 r766  
    398398# Here list all include flags, relative to this "srcdir" directory.  This
    399399# "cygpath" stuff is necessary to compile with native compilers on Windows
    400 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     400AM_CPPFLAGS = \
    401401        -I`$(CYGPATH_W) $(srcdir)/..` \
    402402        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    407407        -I`$(CYGPATH_W) $(srcdir)/../standardize` \
    408408        -I`$(CYGPATH_W) $(srcdir)/../util` \
    409         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     409        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    410410        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    411         -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph`
     411        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph` \
     412        $(COUENNELIB_CFLAGS)
    412413
    413414
  • stable/0.4/Couenne/src/expression/operators/exprGroup.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/heuristics/Makefile.am

    r713 r766  
    3131# Here list all include flags, relative to this "srcdir" directory.  This
    3232# "cygpath" stuff is necessary to compile with native compilers on Windows
    33 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     33AM_CPPFLAGS = \
    3434        -I`$(CYGPATH_W) $(srcdir)/..` \
    3535        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    3838        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
    3939        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    40         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    41         -I`$(CYGPATH_W) $(srcdir)/../util`\
    42         -I`$(CYGPATH_W) $(srcdir)/../problem`
     40        -I`$(CYGPATH_W) $(srcdir)/../branch` \
     41        -I`$(CYGPATH_W) $(srcdir)/../util` \
     42        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     43        $(COUENNELIB_CFLAGS)
    4344
    4445if COIN_HAS_CPX
  • stable/0.4/Couenne/src/heuristics/Makefile.in

    r713 r766  
    331331# Here list all include flags, relative to this "srcdir" directory.  This
    332332# "cygpath" stuff is necessary to compile with native compilers on Windows
    333 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/..` \
    334         -I`$(CYGPATH_W) $(srcdir)/../convex` -I`$(CYGPATH_W) \
    335         $(srcdir)/../expression` -I`$(CYGPATH_W) \
    336         $(srcdir)/../expression/operators` -I`$(CYGPATH_W) \
    337         $(srcdir)/../expression/partial` -I`$(CYGPATH_W) \
    338         $(srcdir)/../interfaces` -I`$(CYGPATH_W) $(srcdir)/../branch` \
    339         -I`$(CYGPATH_W) $(srcdir)/../util` -I`$(CYGPATH_W) \
    340         $(srcdir)/../problem` $(am__append_2)
     333AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
     334        $(srcdir)/../convex` -I`$(CYGPATH_W) $(srcdir)/../expression` \
     335        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     336        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
     337        -I`$(CYGPATH_W) $(srcdir)/../interfaces` -I`$(CYGPATH_W) \
     338        $(srcdir)/../branch` -I`$(CYGPATH_W) $(srcdir)/../util` \
     339        -I`$(CYGPATH_W) $(srcdir)/../problem` $(COUENNELIB_CFLAGS) \
     340        $(am__append_2)
    341341
    342342# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/interfaces/Makefile.am

    r713 r766  
    2020# Here list all include flags, relative to this "srcdir" directory.  This
    2121# "cygpath" stuff is necessary to compile with native compilers on Windows
    22 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     22AM_CPPFLAGS = \
    2323        -I`$(CYGPATH_W) $(srcdir)/..` \
    2424        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    2626        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    2727        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
    28         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    29         -I`$(CYGPATH_W) $(srcdir)/../util`\
    30         -I`$(CYGPATH_W) $(srcdir)/../problem`
     28        -I`$(CYGPATH_W) $(srcdir)/../branch` \
     29        -I`$(CYGPATH_W) $(srcdir)/../util` \
     30        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     31        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
    3132
    3233# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/interfaces/Makefile.in

    r713 r766  
    317317# Here list all include flags, relative to this "srcdir" directory.  This
    318318# "cygpath" stuff is necessary to compile with native compilers on Windows
    319 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     319AM_CPPFLAGS = \
    320320        -I`$(CYGPATH_W) $(srcdir)/..` \
    321321        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    323323        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    324324        -I`$(CYGPATH_W) $(srcdir)/../expression/partial` \
    325         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    326         -I`$(CYGPATH_W) $(srcdir)/../util`\
    327         -I`$(CYGPATH_W) $(srcdir)/../problem`
     325        -I`$(CYGPATH_W) $(srcdir)/../branch` \
     326        -I`$(CYGPATH_W) $(srcdir)/../util` \
     327        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     328        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
    328329
    329330
  • stable/0.4/Couenne/src/main/Makefile.am

    r749 r766  
    2727# Here list all include flags, relative to this "srcdir" directory.  This
    2828# "cygpath" stuff is necessary to compile with native compilers on Windows
    29 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     29AM_CPPFLAGS = \
    3030        -I`$(CYGPATH_W) $(srcdir)/..` \
    3131        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    3434        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    3535        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
    36         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     36        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    3737        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    3838        -I`$(CYGPATH_W) $(srcdir)/../cut/crossconv` \
     
    4040        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening/twoImpliedBT` \
    4141        -I`$(CYGPATH_W) $(srcdir)/../disjunctive` \
    42         -I`$(CYGPATH_W) $(srcdir)/../readnl`
     42        -I`$(CYGPATH_W) $(srcdir)/../readnl` \
     43        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
    4344
    4445# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/main/Makefile.in

    r756 r766  
    329329# Here list all include flags, relative to this "srcdir" directory.  This
    330330# "cygpath" stuff is necessary to compile with native compilers on Windows
    331 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     331AM_CPPFLAGS = \
    332332        -I`$(CYGPATH_W) $(srcdir)/..` \
    333333        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    336336        -I`$(CYGPATH_W) $(srcdir)/../interfaces` \
    337337        -I`$(CYGPATH_W) $(srcdir)/../heuristics` \
    338         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     338        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    339339        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    340340        -I`$(CYGPATH_W) $(srcdir)/../cut/crossconv` \
     
    342342        -I`$(CYGPATH_W) $(srcdir)/../bound_tightening/twoImpliedBT` \
    343343        -I`$(CYGPATH_W) $(srcdir)/../disjunctive` \
    344         -I`$(CYGPATH_W) $(srcdir)/../readnl`
     344        -I`$(CYGPATH_W) $(srcdir)/../readnl` \
     345        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
    345346
    346347
  • stable/0.4/Couenne/src/problem/Makefile.am

    r624 r766  
    5555# Here list all include flags, relative to this "srcdir" directory.  This
    5656# "cygpath" stuff is necessary to compile with native compilers on Windows
    57 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     57AM_CPPFLAGS = \
    5858        -I`$(CYGPATH_W) $(srcdir)/..` \
    5959        -I`$(CYGPATH_W) $(srcdir)/../convex` \
     
    6363        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    6464        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    65         -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph`
     65        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph` \
     66        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
    6667
    6768if COIN_HAS_NTY
  • stable/0.4/Couenne/src/problem/Makefile.in

    r627 r766  
    356356# Here list all include flags, relative to this "srcdir" directory.  This
    357357# "cygpath" stuff is necessary to compile with native compilers on Windows
    358 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) -I`$(CYGPATH_W) \
    359         $(srcdir)/..` -I`$(CYGPATH_W) $(srcdir)/../convex` \
    360         -I`$(CYGPATH_W) $(srcdir)/../expression` -I`$(CYGPATH_W) \
    361         $(srcdir)/../expression/operators` -I`$(CYGPATH_W) \
    362         $(srcdir)/../standardize` -I`$(CYGPATH_W) $(srcdir)/../branch` \
    363         -I`$(CYGPATH_W) $(srcdir)/../problem` -I`$(CYGPATH_W) \
    364         $(srcdir)/../problem/depGraph` $(am__append_2)
     358AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` -I`$(CYGPATH_W) \
     359        $(srcdir)/../convex` -I`$(CYGPATH_W) $(srcdir)/../expression` \
     360        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
     361        -I`$(CYGPATH_W) $(srcdir)/../standardize` -I`$(CYGPATH_W) \
     362        $(srcdir)/../branch` -I`$(CYGPATH_W) $(srcdir)/../problem` \
     363        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph` \
     364        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) $(am__append_2)
    365365
    366366# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/readnl/Makefile.am

    r624 r766  
    2222# Here list all include flags, relative to this "srcdir" directory.  This
    2323# "cygpath" stuff is necessary to compile with native compilers on Windows
    24 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     24AM_CPPFLAGS = \
    2525        -I`$(CYGPATH_W) $(srcdir)/..` \
    2626        -I`$(CYGPATH_W) $(srcdir)/../main` \
     
    2828        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    2929        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    30         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    31         -I`$(CYGPATH_W) $(srcdir)/../problem`
     30        -I`$(CYGPATH_W) $(srcdir)/../branch` \
     31        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     32        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
    3233
    3334# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/readnl/Makefile.in

    r627 r766  
    324324# Here list all include flags, relative to this "srcdir" directory.  This
    325325# "cygpath" stuff is necessary to compile with native compilers on Windows
    326 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) $(ASL_CFLAGS) \
     326AM_CPPFLAGS = \
    327327        -I`$(CYGPATH_W) $(srcdir)/..` \
    328328        -I`$(CYGPATH_W) $(srcdir)/../main` \
     
    330330        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    331331        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    332         -I`$(CYGPATH_W) $(srcdir)/../branch`\
    333         -I`$(CYGPATH_W) $(srcdir)/../problem`
     332        -I`$(CYGPATH_W) $(srcdir)/../branch` \
     333        -I`$(CYGPATH_W) $(srcdir)/../problem` \
     334        $(COUENNELIB_CFLAGS) $(ASL_CFLAGS)
    334335
    335336
  • stable/0.4/Couenne/src/standardize/Makefile.am

    r624 r766  
    2727# Here list all include flags, relative to this "srcdir" directory.  This
    2828# "cygpath" stuff is necessary to compile with native compilers on Windows
    29 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     29AM_CPPFLAGS = \
    3030        -I`$(CYGPATH_W) $(srcdir)/..` \
    3131        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    3232        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    33         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     33        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    3434        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    35         -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph`
     35        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph` \
     36        $(COUENNELIB_CFLAGS)
    3637
    3738# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/standardize/Makefile.in

    r627 r766  
    326326# Here list all include flags, relative to this "srcdir" directory.  This
    327327# "cygpath" stuff is necessary to compile with native compilers on Windows
    328 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     328AM_CPPFLAGS = \
    329329        -I`$(CYGPATH_W) $(srcdir)/..` \
    330330        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    331331        -I`$(CYGPATH_W) $(srcdir)/../expression/operators` \
    332         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     332        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    333333        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    334         -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph`
     334        -I`$(CYGPATH_W) $(srcdir)/../problem/depGraph` \
     335        $(COUENNELIB_CFLAGS)
    335336
    336337
  • stable/0.4/Couenne/src/util/Makefile.am

    r713 r766  
    2020# Here list all include flags, relative to this "srcdir" directory.  This
    2121# "cygpath" stuff is necessary to compile with native compilers on Windows
    22 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     22AM_CPPFLAGS = \
    2323        -I`$(CYGPATH_W) $(srcdir)/..` \
    2424        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    2525        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    26         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     26        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    2727        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    28         -I`$(CYGPATH_W) $(srcdir)/../util`
     28        -I`$(CYGPATH_W) $(srcdir)/../util` \
     29        $(COUENNELIB_CFLAGS)
    2930
    3031# This line is necessary to allow VPATH compilation
  • stable/0.4/Couenne/src/util/Makefile.in

    r713 r766  
    316316# Here list all include flags, relative to this "srcdir" directory.  This
    317317# "cygpath" stuff is necessary to compile with native compilers on Windows
    318 AM_CPPFLAGS = $(COUENNELIB_CFLAGS) \
     318AM_CPPFLAGS = \
    319319        -I`$(CYGPATH_W) $(srcdir)/..` \
    320320        -I`$(CYGPATH_W) $(srcdir)/../expression` \
    321321        -I`$(CYGPATH_W) $(srcdir)/../convex` \
    322         -I`$(CYGPATH_W) $(srcdir)/../branch`\
     322        -I`$(CYGPATH_W) $(srcdir)/../branch` \
    323323        -I`$(CYGPATH_W) $(srcdir)/../problem` \
    324         -I`$(CYGPATH_W) $(srcdir)/../util`
     324        -I`$(CYGPATH_W) $(srcdir)/../util` \
     325        $(COUENNELIB_CFLAGS)
    325326
    326327
Note: See TracChangeset for help on using the changeset viewer.