Changeset 1006


Ignore:
Timestamp:
Jan 4, 2008 5:12:44 AM (12 years ago)
Author:
pbonami
Message:

Fix Ticket #19

Location:
branches/0.9/Bonmin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/0.9/Bonmin/Makefile.am

    r671 r1006  
    1515# Here list all subdirectories into which to recurse
    1616SUBDIRS = src/Interfaces \
    17         src/Algorithms \
    18         src/CbcBonmin \
    19         src/Apps
    20 
    21 if BUILD_FP
    22 SUBDIRS += experimental/FP
    23 endif
    24 
    25 if COIN_HAS_BCP
    26 SUBDIRS += experimental/Bcp
    27 endif
    28 
    29 if COIN_HAS_COUENNE
    30 SUBDIRS += experimental/NotConvex
    31 endif
     17          src/Algorithms \
     18          src/CbcBonmin \
     19          src/Apps
    3220
    3321# We don't want to compile the test subdirectory, unless the test target is
  • branches/0.9/Bonmin/Makefile.in

    r912 r1006  
    5252build_triplet = @build@
    5353host_triplet = @host@
    54 @BUILD_FP_TRUE@am__append_1 = experimental/FP
    55 @COIN_HAS_BCP_TRUE@am__append_2 = experimental/Bcp
    56 @COIN_HAS_COUENNE_TRUE@am__append_3 = experimental/NotConvex
    5754
    5855# We don't want to compile the test subdirectory, unless the test target is
    5956# specified.  But we need to list it as subdirectory to make sure that it is
    6057# included in the tarball
    61 @ALWAYS_FALSE@am__append_4 = test
     58@ALWAYS_FALSE@am__append_1 = test
    6259DIST_COMMON = README $(am__configure_deps) \
    6360        $(srcdir)/../BuildTools/Makemain.inc $(srcdir)/../config.guess \
     
    7168        $(top_srcdir)/examples/CppExample/MyTMINLP.hpp \
    7269        $(top_srcdir)/examples/OptionDocGen/Makefile.in \
    73         $(top_srcdir)/experimental/Bcp/Makefile.in \
    74         $(top_srcdir)/experimental/FP/Makefile.in \
    75         $(top_srcdir)/experimental/NotConvex/Makefile.in \
    7670        $(top_srcdir)/inc/config_bonmin.h.in AUTHORS INSTALL
    77 @HAVE_EXTERNALS_TRUE@am__append_5 = Externals
    78 @HAVE_EXTERNALS_TRUE@am__append_6 = .Externals-stamp
     71@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
     72@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
    7973subdir = .
    8074ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    8781mkinstalldirs = $(install_sh) -d
    8882CONFIG_HEADER = $(top_builddir)/inc/config_bonmin.h
    89 CONFIG_CLEAN_FILES = experimental/Bcp/Makefile \
    90         experimental/FP/Makefile experimental/NotConvex/Makefile \
    91         examples/OptionDocGen/Makefile examples/CppExample/Makefile
     83CONFIG_CLEAN_FILES = examples/OptionDocGen/Makefile \
     84        examples/CppExample/Makefile
    9285SOURCES =
    9386DIST_SOURCES =
     
    10194CTAGS = ctags
    10295DIST_SUBDIRS = src/Interfaces src/Algorithms src/CbcBonmin src/Apps \
    103         experimental/FP experimental/Bcp experimental/NotConvex test
     96        test
    10497DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    10598distdir = $(PACKAGE)-$(VERSION)
     
    340333# Here list all subdirectories into which to recurse
    341334SUBDIRS = src/Interfaces src/Algorithms src/CbcBonmin src/Apps \
    342         $(am__append_1) $(am__append_2) $(am__append_3) \
    343         $(am__append_4)
     335        $(am__append_1)
    344336
    345337########################################################################
     
    352344        doc/BOUM_Intro.tex doc/options.tex test/InterfaceTest.cpp \
    353345        test/CppExample/MyTMINLP.hpp test/CppExample/MyTMINLP.cpp \
    354         test/CppExample/MyBonmin.cpp test/mytoy.nl $(am__append_5)
     346        test/CppExample/MyBonmin.cpp test/mytoy.nl $(am__append_2)
    355347
    356348########################################################################
     
    362354        Test/CppExample/*.$(OBJEXT) \
    363355        Test/CppExample/CppExample$(EXEEXT) Test/testtoy.nl \
    364         $(am__append_6) $(VPATH_DISTCLEANFILES)
     356        $(am__append_3) $(VPATH_DISTCLEANFILES)
    365357all: all-recursive
    366358
     
    416408distclean-hdr:
    417409        -rm -f inc/config_bonmin.h inc/stamp-h1
    418 experimental/Bcp/Makefile: $(top_builddir)/config.status $(top_srcdir)/experimental/Bcp/Makefile.in
    419         cd $(top_builddir) && $(SHELL) ./config.status $@
    420 experimental/FP/Makefile: $(top_builddir)/config.status $(top_srcdir)/experimental/FP/Makefile.in
    421         cd $(top_builddir) && $(SHELL) ./config.status $@
    422 experimental/NotConvex/Makefile: $(top_builddir)/config.status $(top_srcdir)/experimental/NotConvex/Makefile.in
    423         cd $(top_builddir) && $(SHELL) ./config.status $@
    424410examples/OptionDocGen/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/OptionDocGen/Makefile.in
    425411        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    572558        $(am__remove_distdir)
    573559        mkdir $(distdir)
    574         $(mkdir_p) $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/examples/CppExample $(distdir)/examples/OptionDocGen $(distdir)/experimental/Bcp $(distdir)/experimental/FP $(distdir)/experimental/NotConvex $(distdir)/inc $(distdir)/test $(distdir)/test/CppExample
     560        $(mkdir_p) $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/examples/CppExample $(distdir)/examples/OptionDocGen $(distdir)/inc $(distdir)/test $(distdir)/test/CppExample
    575561        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    576562        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • branches/0.9/Bonmin/configure

    r830 r1006  
    1010#
    1111#
    12 # Copyright 2006 International Business Machines and others.
     12# Copyright 2006, 2007 International Business Machines and others.
    1313# All Rights Reserved.
    1414# This file is part of the open source package BONMIN which is distributed
     
    12911291
    12921292
    1293 Copyright 2006 International Business Machines and others.
     1293Copyright 2006, 2007 International Business Machines and others.
    12941294All Rights Reserved.
    12951295This file is part of the open source package BONMIN which is distributed
     
    2382023820##############################################################################
    2382123821
    23822                                                                                                                                                                           ac_config_files="$ac_config_files Makefile src/Apps/Makefile experimental/Bcp/Makefile src/CbcBonmin/Makefile src/Interfaces/Makefile src/Interfaces/Ipopt/Makefile src/Interfaces/Filter/Makefile src/Interfaces/Ampl/Makefile src/Algorithms/Makefile src/Algorithms/Ampl/Makefile src/Algorithms/Branching/Makefile src/Algorithms/OaGenerators/Makefile experimental/FP/Makefile experimental/NotConvex/Makefile examples/OptionDocGen/Makefile test/Makefile examples/CppExample/Makefile"
     23822                                                                                                                                            ac_config_files="$ac_config_files Makefile src/Apps/Makefile src/CbcBonmin/Makefile src/Interfaces/Makefile src/Interfaces/Ipopt/Makefile src/Interfaces/Filter/Makefile src/Interfaces/Ampl/Makefile src/Algorithms/Makefile src/Algorithms/Ampl/Makefile src/Algorithms/Branching/Makefile src/Algorithms/OaGenerators/Makefile examples/OptionDocGen/Makefile test/Makefile examples/CppExample/Makefile"
    2382323823
    2382423824
     
    2461224612  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2461324613  "src/Apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Apps/Makefile" ;;
    24614   "experimental/Bcp/Makefile" ) CONFIG_FILES="$CONFIG_FILES experimental/Bcp/Makefile" ;;
    2461524614  "src/CbcBonmin/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/CbcBonmin/Makefile" ;;
    2461624615  "src/Interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Interfaces/Makefile" ;;
     
    2462224621  "src/Algorithms/Branching/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Algorithms/Branching/Makefile" ;;
    2462324622  "src/Algorithms/OaGenerators/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Algorithms/OaGenerators/Makefile" ;;
    24624   "experimental/FP/Makefile" ) CONFIG_FILES="$CONFIG_FILES experimental/FP/Makefile" ;;
    24625   "experimental/NotConvex/Makefile" ) CONFIG_FILES="$CONFIG_FILES experimental/NotConvex/Makefile" ;;
    2462624623  "examples/OptionDocGen/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/OptionDocGen/Makefile" ;;
    2462724624  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
  • branches/0.9/Bonmin/configure.ac

    r767 r1006  
    1616
    1717AC_COPYRIGHT([
    18 Copyright 2006 International Business Machines and others.
     18Copyright 2006, 2007 International Business Machines and others.
    1919All Rights Reserved.
    2020This file is part of the open source package BONMIN which is distributed
     
    186186AC_CONFIG_FILES([Makefile
    187187                 src/Apps/Makefile
    188                  experimental/Bcp/Makefile
    189188                 src/CbcBonmin/Makefile
    190189                 src/Interfaces/Makefile
     
    196195                 src/Algorithms/Branching/Makefile
    197196                 src/Algorithms/OaGenerators/Makefile
    198                  experimental/FP/Makefile
    199                  experimental/NotConvex/Makefile
    200197                 examples/OptionDocGen/Makefile
    201198                 test/Makefile
Note: See TracChangeset for help on using the changeset viewer.