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

fix order of -I flags, so uninstalled headers are prefered to installed ones in case headers of dependencies are in installation directory; fix addlibs file for cl

File:
1 edited

Legend:

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

    r749 r765  
    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
Note: See TracChangeset for help on using the changeset viewer.