Changeset 83


Ignore:
Timestamp:
Oct 23, 2006 12:53:13 PM (13 years ago)
Author:
pbonami
Message:

Adding prefix Bon to file names

Location:
branches/devel/Bonmin/src
Files:
3 added
9 edited
8 copied
1 moved

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/Apps/Makefile.am

    r64 r83  
    8181AM_CPPFLAGS = \
    8282        -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    83         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` \
     83        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` \
    8484        -I`$(CYGPATH_W) $(srcdir)/../BonminAmplInterface` \
    8585        -I`$(CYGPATH_W) $(srcdir)/../CbcBonmin` \
  • branches/devel/Bonmin/src/Apps/Makefile.in

    r64 r83  
    385385# "cygpath" stuff is necessary to compile with native compilers on Windows
    386386AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    387         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` -I`$(CYGPATH_W) \
     387        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` -I`$(CYGPATH_W) \
    388388        $(srcdir)/../BonminAmplInterface` -I`$(CYGPATH_W) \
    389389        $(srcdir)/../CbcBonmin` -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
  • branches/devel/Bonmin/src/BonminAmplInterface/Makefile.am

    r58 r83  
    4040        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    4141        -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    42         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface`
     42        -I`$(CYGPATH_W) $(srcdir)/../Interfaces`
    4343
    4444AM_CPPFLAGS += $(ASL_CPPFLAGS)
  • branches/devel/Bonmin/src/BonminAmplInterface/Makefile.in

    r64 r83  
    332332        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` -I`$(CYGPATH_W) \
    333333        $(CLPOBJDIR)/inc` -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    334         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` $(ASL_CPPFLAGS)
     334        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` $(ASL_CPPFLAGS)
    335335
    336336# This line is necessary to allow VPATH compilation with MS compilers
  • branches/devel/Bonmin/src/CbcBonmin/Makefile.am

    r57 r83  
    3131AM_CPPFLAGS = \
    3232        -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    33         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` \
     33        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` \
    3434        -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    3535        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
  • branches/devel/Bonmin/src/CbcBonmin/Makefile.in

    r64 r83  
    329329# "cygpath" stuff is necessary to compile with native compilers on Windows
    330330AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    331         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` -I`$(CYGPATH_W) \
     331        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` -I`$(CYGPATH_W) \
    332332        $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    333333        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` -I`$(CYGPATH_W) \
  • branches/devel/Bonmin/src/Interfaces/Makefile.in

    r71 r83  
    4747@COIN_HAS_FSQP_TRUE@    BonFilterSolver.cpp BonFilterSolver.hpp
    4848
    49 subdir = src/IpoptInterface
     49subdir = src/Interfaces
    5050DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
    5151        $(srcdir)/Makefile.in
     
    420420          esac; \
    421421        done; \
    422         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/IpoptInterface/Makefile'; \
     422        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Interfaces/Makefile'; \
    423423        cd $(top_srcdir) && \
    424           $(AUTOMAKE) --foreign  src/IpoptInterface/Makefile
     424          $(AUTOMAKE) --foreign  src/Interfaces/Makefile
    425425.PRECIOUS: Makefile
    426426Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • branches/devel/Bonmin/src/OaInterface/Makefile.am

    r58 r83  
    2929# "cygpath" stuff is necessary to compile with native compilers on Windows
    3030AM_CPPFLAGS = \
    31         -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` \
     31        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` \
    3232        -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    3333        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
  • branches/devel/Bonmin/src/OaInterface/Makefile.in

    r64 r83  
    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 = -I`$(CYGPATH_W) $(srcdir)/../IpoptInterface` \
    319         -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) \
    320         $(IPOPTSRCDIR)/src/Common` -I`$(CYGPATH_W) \
    321         $(IPOPTSRCDIR)/src/Interfaces` -I`$(CYGPATH_W) \
     318AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../Interfaces` -I`$(CYGPATH_W) \
     319        $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
     320        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` -I`$(CYGPATH_W) \
    322321        $(IPOPTSRCDIR)/src/LinAlg` -I`$(CYGPATH_W) \
    323322        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
Note: See TracChangeset for help on using the changeset viewer.