Ignore:
Timestamp:
Oct 23, 2006 2:18:33 PM (13 years ago)
Author:
pbonami
Message:

Update makefiles in test

Location:
branches/devel/Bonmin/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/test/Makefile.am

    r53 r84  
    2020# List libraries of COIN projects
    2121unitTest_LDADD = \
    22         ../src/BonminAmplInterface/libamplinterface.la \
     22        ../src/Interfaces/Ampl/libamplinterface.la \
    2323        ../src/Apps/libbonmin.la \
    2424        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
     
    6767AM_CPPFLAGS = \
    6868        -I`$(CYGPATH_W) $(srcdir)/../src/Apps` \
    69         -I`$(CYGPATH_W) $(srcdir)/../src/IpoptInterface` \
    70         -I`$(CYGPATH_W) $(srcdir)/../src/BonminAmplInterface` \
     69        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces` \
     70        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces/Ipopt` \
     71        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces/Filter` \
     72        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces/Ampl` \
    7173        -I`$(CYGPATH_W) $(srcdir)/../src/CbcBonmin` \
    7274        -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
  • branches/devel/Bonmin/test/Makefile.in

    r64 r84  
    7878am_unitTest_OBJECTS = InterfaceTest.$(OBJEXT)
    7979unitTest_OBJECTS = $(am_unitTest_OBJECTS)
    80 unitTest_DEPENDENCIES =  \
    81         ../src/BonminAmplInterface/libamplinterface.la \
     80unitTest_DEPENDENCIES = ../src/Interfaces/Ampl/libamplinterface.la \
    8281        ../src/Apps/libbonmin.la \
    8382        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
     
    326325# List libraries of COIN projects
    327326unitTest_LDADD = \
    328         ../src/BonminAmplInterface/libamplinterface.la \
     327        ../src/Interfaces/Ampl/libamplinterface.la \
    329328        ../src/Apps/libbonmin.la \
    330329        $(IPOPTOBJDIR)/src/Apps/AmplSolver/libamplinterface.la \
     
    359358AM_CPPFLAGS = \
    360359        -I`$(CYGPATH_W) $(srcdir)/../src/Apps` \
    361         -I`$(CYGPATH_W) $(srcdir)/../src/IpoptInterface` \
    362         -I`$(CYGPATH_W) $(srcdir)/../src/BonminAmplInterface` \
     360        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces` \
     361        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces/Ipopt` \
     362        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces/Filter` \
     363        -I`$(CYGPATH_W) $(srcdir)/../src/Interfaces/Ampl` \
    363364        -I`$(CYGPATH_W) $(srcdir)/../src/CbcBonmin` \
    364365        -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
Note: See TracChangeset for help on using the changeset viewer.