Changeset 86


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

New directory layout regroup interfercaces in same subdirectory

Location:
branches/devel/Bonmin/src
Files:
1 deleted
8 edited
14 moved

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/src/Apps/BonMin.cpp

    r81 r86  
    2020
    2121#include "BonAmplInterface.hpp"
    22 #include "BonFilterSolver.hpp"
     22#include "BonIpoptSolver.hpp"
    2323#include "BonCbc.hpp"
    2424
     
    135135  double time1 = CoinCpuTime();
    136136  try {
    137   Ipopt::SmartPtr<TNLPSolver> filterSolver = new FilterSolver;
     137  Ipopt::SmartPtr<TNLPSolver> filterSolver = new IpoptSolver;
    138138  nlpSolver = new AmplInterface(argv, filterSolver);
    139139    BonminCbcParam par;
  • branches/devel/Bonmin/src/Apps/Makefile.am

    r83 r86  
    8282        -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    8383        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` \
    84         -I`$(CYGPATH_W) $(srcdir)/../BonminAmplInterface` \
     84        -I`$(CYGPATH_W) $(srcdir)/../Interfaces/Ipopt` \
     85        -I`$(CYGPATH_W) $(srcdir)/../Interfaces/Filter` \
     86        -I`$(CYGPATH_W) $(srcdir)/../Interfaces/Ampl` \
    8587        -I`$(CYGPATH_W) $(srcdir)/../CbcBonmin` \
    8688        -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
  • branches/devel/Bonmin/src/Apps/Makefile.in

    r83 r86  
    386386AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    387387        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` -I`$(CYGPATH_W) \
    388         $(srcdir)/../BonminAmplInterface` -I`$(CYGPATH_W) \
     388        $(srcdir)/../Interfaces/Ipopt` -I`$(CYGPATH_W) \
     389        $(srcdir)/../Interfaces/Filter` -I`$(CYGPATH_W) \
     390        $(srcdir)/../Interfaces/Ampl` -I`$(CYGPATH_W) \
    389391        $(srcdir)/../CbcBonmin` -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    390392        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` -I`$(CYGPATH_W) \
  • branches/devel/Bonmin/src/CbcBonmin/Makefile.am

    r83 r86  
    3232        -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    3333        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` \
     34        -I`$(CYGPATH_W) $(srcdir)/../Interfaces/Ipopt` \
     35        -I`$(CYGPATH_W) $(srcdir)/../Interfaces/Ampl` \
     36        -I`$(CYGPATH_W) $(srcdir)/../Interfaces/Filter` \
    3437        -I`$(CYGPATH_W) $(IPOPTOBJDIR)/inc` \
    3538        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
  • branches/devel/Bonmin/src/CbcBonmin/Makefile.in

    r83 r86  
    330330AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../OaInterface` \
    331331        -I`$(CYGPATH_W) $(srcdir)/../Interfaces` -I`$(CYGPATH_W) \
     332        $(srcdir)/../Interfaces/Ipopt` -I`$(CYGPATH_W) \
     333        $(srcdir)/../Interfaces/Ampl` -I`$(CYGPATH_W) \
     334        $(srcdir)/../Interfaces/Filter` -I`$(CYGPATH_W) \
    332335        $(IPOPTOBJDIR)/inc` -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Common` \
    333336        -I`$(CYGPATH_W) $(IPOPTSRCDIR)/src/Interfaces` -I`$(CYGPATH_W) \
  • branches/devel/Bonmin/src/Interfaces/Ampl/BonAmplInterface.cpp

    r81 r86  
    1616      amplTminlp_(NULL)
    1717  {
    18     readAmplNlFile(amplArgs, NULL, NULL, app);
     18    readAmplNlFile(amplArgs, app, NULL, NULL);
    1919  }
    2020
     
    4141  void
    4242  AmplInterface::readAmplNlFile(char**& filename,
     43      Ipopt::SmartPtr<TNLPSolver> app,
    4344      std::string* ipopt_file_content,
    44       std::string* nl_file_content,
    45       Ipopt::SmartPtr<TNLPSolver> app)
     45      std::string* nl_file_content)
    4646  {
    4747
  • branches/devel/Bonmin/src/Interfaces/Ampl/BonAmplInterface.hpp

    r81 r86  
    33#include "BonOsiTMINLPInterface.hpp"
    44#include "BonAmplTMINLP.hpp"
    5 #include "BonIpoptSolver.hpp"
    65
    76namespace Bonmin
     
    2726    /** Read an ampl . nl file from the given filename */
    2827    virtual void readAmplNlFile(char**& filename,
     28        Ipopt::SmartPtr<TNLPSolver> app,
    2929        std::string* ipopt_file_content =NULL,
    30         std::string* nl_file_content = NULL,
    31         Ipopt::SmartPtr<TNLPSolver> app = new Bonmin::IpoptSolver());
     30        std::string* nl_file_content = NULL
     31        );
    3232    /** write ampl solution file */
    3333    void writeAmplSolFile(std::string message,const double * primalSol = NULL,const double * dualSol = NULL);
  • branches/devel/Bonmin/src/Interfaces/Ampl/Makefile.am

    r83 r86  
    4040        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc` \
    4141        -I`$(CYGPATH_W) $(CLPSRCDIR)/src` \
    42         -I`$(CYGPATH_W) $(srcdir)/../Interfaces`
     42        -I`$(CYGPATH_W) $(srcdir)/..`
    4343
    4444AM_CPPFLAGS += $(ASL_CPPFLAGS)
  • branches/devel/Bonmin/src/Interfaces/BonTMINLP2TNLP.hpp

    r83 r86  
    1818#include "IpIpoptApplication.hpp"
    1919#include "IpOptionsList.hpp"
    20 #include "BonIpoptInteriorWarmStarter.hpp"
     20#include "Ipopt/BonIpoptInteriorWarmStarter.hpp"
    2121
    2222namespace Bonmin
  • branches/devel/Bonmin/src/Interfaces/Makefile.am

    r71 r86  
    99AUTOMAKE_OPTIONS = foreign
    1010
     11#We need to do autothings in the subdirectories for the different interfaces
     12SUBDIRS = Ipopt Ampl
     13
     14if COIN_HAS_FSQP
     15SUBDIRS += Filter
     16endif
     17
    1118########################################################################
    1219#                          libipoptinterface                           #
     
    1421
    1522# Name of the library in this directory
    16 noinst_LTLIBRARIES = libipoptinterface.la
     23noinst_LTLIBRARIES = libbonmininterfaces.la
    1724# List all source files, including headers
    18 libipoptinterface_la_SOURCES = \
     25libbonmininterfaces_la_SOURCES = \
    1926        BonBoundsReader.cpp BonBoundsReader.hpp \
    2027        BonColReader.cpp BonColReader.hpp \
     
    2229        BonStartPointReader.cpp BonStartPointReader.hpp \
    2330        BonOsiTMINLPInterface.cpp BonOsiTMINLPInterface.hpp \
    24         BonIpoptInteriorWarmStarter.cpp BonIpoptInteriorWarmStarter.hpp \
    25         BonIpoptWarmStart.cpp BonIpoptWarmStart.hpp \
    2631        BonTMINLP2TNLP.cpp BonTMINLP2TNLP.hpp \
    2732        BonTMINLP.cpp BonTMINLP.hpp \
    28         BonIpoptSolver.hpp BonIpoptSolver.cpp \
    2933        BonTNLPSolver.hpp BonTNLPSolver.cpp \
    3034        BonTNLP2FPNLP.cpp BonTNLP2FPNLP.hpp
    3135
     36#sublibraries for various installed solvers
     37libbonmininterfaces_la_LIBADD = Ipopt/libipoptinterface.la \
     38                              Ampl/libamplinterface.la
    3239if COIN_HAS_FSQP
    33 libipoptinterface_la_SOURCES += \
    34         BonFilterSolver.cpp BonFilterSolver.hpp
     40libbonmininterfaces_la_LIBADD += Filter/libfilterinterface.la
    3541endif
     42
     43libbonmininterfaces_la_DEPENDENCIES = $(libipoptinterface_la_LIBADD)
     44
    3645# This is for libtool (on Windows)
    37 libipoptinterface_la_LDFLAGS = $(LT_LDFLAGS)
     46libbonmininterfaces_la_LDFLAGS = $(LT_LDFLAGS)
    3847
    3948# Here list all include flags, relative to this "srcdir" directory.  This
     
    6574include_HEADERS = \
    6675        BonOsiTMINLPInterface.hpp \
    67         BonIpoptInteriorWarmStarter.hpp \
    6876        BonTMINLP2TNLP.hpp \
    6977        BonTMINLP.hpp \
    7078        BonTNLP2FPNLP.hpp \
    71         BonTNLPSolver.hpp \
    72         BonIpoptSolver.hpp \
    73         BonFilterSolver.hpp
     79        BonTNLPSolver.hpp
    7480
    7581#############################################################################
     
    101107        BonStartPointReaderbak.cpp BonStartPointReader.hpp \
    102108        BonOsiTMINLPInterfacebak.cpp BonOsiTMINLPInterface.hpp \
    103         BonIpoptInteriorWarmStarterbak.cpp BonIpoptInteriorWarmStarter.hpp \
    104         BonIpoptWarmStartbak.cpp BonIpoptWarmStart.hpp \
    105109        BonTMINLP2TNLPbak.cpp BonTMINLP2TNLP.hpp \
    106110        BonTMINLPbak.cpp BonTMINLP.hpp \
    107         BonIpoptSolverbak.hpp BonIpoptSolver.cpp \
    108111        BonTNLPSolverbak.hpp BonTNLPSolver.cpp \
    109112        BonTNLP2FPNLPbak.cpp BonTNLP2FPNLP.hpp
  • branches/devel/Bonmin/src/Interfaces/Makefile.in

    r83 r86  
    4444build_triplet = @build@
    4545host_triplet = @host@
    46 @COIN_HAS_FSQP_TRUE@am__append_1 = \
    47 @COIN_HAS_FSQP_TRUE@    BonFilterSolver.cpp BonFilterSolver.hpp
    48 
     46@COIN_HAS_FSQP_TRUE@am__append_1 = Filter
     47@COIN_HAS_FSQP_TRUE@am__append_2 = Filter/libfilterinterface.la
    4948subdir = src/Interfaces
    5049DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
     
    5958CONFIG_CLEAN_FILES =
    6059LTLIBRARIES = $(noinst_LTLIBRARIES)
    61 libipoptinterface_la_LIBADD =
    62 am__libipoptinterface_la_SOURCES_DIST = BonBoundsReader.cpp \
    63         BonBoundsReader.hpp BonColReader.cpp BonColReader.hpp \
    64         BonCurvatureEstimator.cpp BonCurvatureEstimator.hpp \
    65         BonStartPointReader.cpp BonStartPointReader.hpp \
    66         BonOsiTMINLPInterface.cpp BonOsiTMINLPInterface.hpp \
    67         BonIpoptInteriorWarmStarter.cpp \
    68         BonIpoptInteriorWarmStarter.hpp BonIpoptWarmStart.cpp \
    69         BonIpoptWarmStart.hpp BonTMINLP2TNLP.cpp BonTMINLP2TNLP.hpp \
    70         BonTMINLP.cpp BonTMINLP.hpp BonIpoptSolver.hpp \
    71         BonIpoptSolver.cpp BonTNLPSolver.hpp BonTNLPSolver.cpp \
    72         BonTNLP2FPNLP.cpp BonTNLP2FPNLP.hpp BonFilterSolver.cpp \
    73         BonFilterSolver.hpp
    74 @COIN_HAS_FSQP_TRUE@am__objects_1 = BonFilterSolver.lo
    75 am_libipoptinterface_la_OBJECTS = BonBoundsReader.lo BonColReader.lo \
     60@COIN_HAS_FSQP_TRUE@am__DEPENDENCIES_1 = Filter/libfilterinterface.la
     61am_libbonmininterfaces_la_OBJECTS = BonBoundsReader.lo BonColReader.lo \
    7662        BonCurvatureEstimator.lo BonStartPointReader.lo \
    77         BonOsiTMINLPInterface.lo BonIpoptInteriorWarmStarter.lo \
    78         BonIpoptWarmStart.lo BonTMINLP2TNLP.lo BonTMINLP.lo \
    79         BonIpoptSolver.lo BonTNLPSolver.lo BonTNLP2FPNLP.lo \
    80         $(am__objects_1)
    81 libipoptinterface_la_OBJECTS = $(am_libipoptinterface_la_OBJECTS)
     63        BonOsiTMINLPInterface.lo BonTMINLP2TNLP.lo BonTMINLP.lo \
     64        BonTNLPSolver.lo BonTNLP2FPNLP.lo
     65libbonmininterfaces_la_OBJECTS = $(am_libbonmininterfaces_la_OBJECTS)
    8266depcomp = $(SHELL) $(top_srcdir)/../depcomp
    8367am__depfiles_maybe = depfiles
     
    9882LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    9983        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    100 SOURCES = $(libipoptinterface_la_SOURCES)
    101 DIST_SOURCES = $(am__libipoptinterface_la_SOURCES_DIST)
     84SOURCES = $(libbonmininterfaces_la_SOURCES)
     85DIST_SOURCES = $(libbonmininterfaces_la_SOURCES)
     86RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
     87        html-recursive info-recursive install-data-recursive \
     88        install-exec-recursive install-info-recursive \
     89        install-recursive installcheck-recursive installdirs-recursive \
     90        pdf-recursive ps-recursive uninstall-info-recursive \
     91        uninstall-recursive
    10292am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    10393am__vpath_adj = case $$p in \
     
    111101ETAGS = etags
    112102CTAGS = ctags
     103DIST_SUBDIRS = Ipopt Ampl Filter
    113104DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    114105ACLOCAL = @ACLOCAL@
     
    323314AUTOMAKE_OPTIONS = foreign
    324315
     316#We need to do autothings in the subdirectories for the different interfaces
     317SUBDIRS = Ipopt Ampl $(am__append_1)
     318
    325319########################################################################
    326320#                          libipoptinterface                           #
     
    328322
    329323# Name of the library in this directory
    330 noinst_LTLIBRARIES = libipoptinterface.la
     324noinst_LTLIBRARIES = libbonmininterfaces.la
    331325# List all source files, including headers
    332 libipoptinterface_la_SOURCES = BonBoundsReader.cpp BonBoundsReader.hpp \
    333         BonColReader.cpp BonColReader.hpp BonCurvatureEstimator.cpp \
    334         BonCurvatureEstimator.hpp BonStartPointReader.cpp \
    335         BonStartPointReader.hpp BonOsiTMINLPInterface.cpp \
    336         BonOsiTMINLPInterface.hpp BonIpoptInteriorWarmStarter.cpp \
    337         BonIpoptInteriorWarmStarter.hpp BonIpoptWarmStart.cpp \
    338         BonIpoptWarmStart.hpp BonTMINLP2TNLP.cpp BonTMINLP2TNLP.hpp \
    339         BonTMINLP.cpp BonTMINLP.hpp BonIpoptSolver.hpp \
    340         BonIpoptSolver.cpp BonTNLPSolver.hpp BonTNLPSolver.cpp \
    341         BonTNLP2FPNLP.cpp BonTNLP2FPNLP.hpp $(am__append_1)
     326libbonmininterfaces_la_SOURCES = \
     327        BonBoundsReader.cpp BonBoundsReader.hpp \
     328        BonColReader.cpp BonColReader.hpp \
     329        BonCurvatureEstimator.cpp BonCurvatureEstimator.hpp \
     330        BonStartPointReader.cpp BonStartPointReader.hpp \
     331        BonOsiTMINLPInterface.cpp BonOsiTMINLPInterface.hpp \
     332        BonTMINLP2TNLP.cpp BonTMINLP2TNLP.hpp \
     333        BonTMINLP.cpp BonTMINLP.hpp \
     334        BonTNLPSolver.hpp BonTNLPSolver.cpp \
     335        BonTNLP2FPNLP.cpp BonTNLP2FPNLP.hpp
     336
     337
     338#sublibraries for various installed solvers
     339libbonmininterfaces_la_LIBADD = Ipopt/libipoptinterface.la \
     340        Ampl/libamplinterface.la $(am__append_2)
     341libbonmininterfaces_la_DEPENDENCIES = $(libipoptinterface_la_LIBADD)
     342
    342343# This is for libtool (on Windows)
    343 libipoptinterface_la_LDFLAGS = $(LT_LDFLAGS)
     344libbonmininterfaces_la_LDFLAGS = $(LT_LDFLAGS)
    344345
    345346# Here list all include flags, relative to this "srcdir" directory.  This
     
    371372include_HEADERS = \
    372373        BonOsiTMINLPInterface.hpp \
    373         BonIpoptInteriorWarmStarter.hpp \
    374374        BonTMINLP2TNLP.hpp \
    375375        BonTMINLP.hpp \
    376376        BonTNLP2FPNLP.hpp \
    377         BonTNLPSolver.hpp \
    378         BonIpoptSolver.hpp \
    379         BonFilterSolver.hpp
     377        BonTNLPSolver.hpp
    380378
    381379
     
    397395        BonStartPointReaderbak.cpp BonStartPointReader.hpp \
    398396        BonOsiTMINLPInterfacebak.cpp BonOsiTMINLPInterface.hpp \
    399         BonIpoptInteriorWarmStarterbak.cpp BonIpoptInteriorWarmStarter.hpp \
    400         BonIpoptWarmStartbak.cpp BonIpoptWarmStart.hpp \
    401397        BonTMINLP2TNLPbak.cpp BonTMINLP2TNLP.hpp \
    402398        BonTMINLPbak.cpp BonTMINLP.hpp \
    403         BonIpoptSolverbak.hpp BonIpoptSolver.cpp \
    404399        BonTNLPSolverbak.hpp BonTNLPSolver.cpp \
    405400        BonTNLP2FPNLPbak.cpp BonTNLP2FPNLP.hpp
     
    407402CLEANFILES = $(ASTYLE_FILES)
    408403SUFFIXES = .cppbak .hppbak
    409 all: all-am
     404all: all-recursive
    410405
    411406.SUFFIXES:
     
    449444          rm -f "$${dir}/so_locations"; \
    450445        done
    451 libipoptinterface.la: $(libipoptinterface_la_OBJECTS) $(libipoptinterface_la_DEPENDENCIES)
    452         $(CXXLINK)  $(libipoptinterface_la_LDFLAGS) $(libipoptinterface_la_OBJECTS) $(libipoptinterface_la_LIBADD) $(LIBS)
     446libbonmininterfaces.la: $(libbonmininterfaces_la_OBJECTS) $(libbonmininterfaces_la_DEPENDENCIES)
     447        $(CXXLINK)  $(libbonmininterfaces_la_LDFLAGS) $(libbonmininterfaces_la_OBJECTS) $(libbonmininterfaces_la_LIBADD) $(LIBS)
    453448
    454449mostlyclean-compile:
     
    461456@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonColReader.Plo@am__quote@
    462457@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonCurvatureEstimator.Plo@am__quote@
    463 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonFilterSolver.Plo@am__quote@
    464 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonIpoptInteriorWarmStarter.Plo@am__quote@
    465 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonIpoptSolver.Plo@am__quote@
    466 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonIpoptWarmStart.Plo@am__quote@
    467458@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonOsiTMINLPInterface.Plo@am__quote@
    468459@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BonStartPointReader.Plo@am__quote@
     
    520511        done
    521512
     513# This directory's subdirectories are mostly independent; you can cd
     514# into them and run `make' without going through this Makefile.
     515# To change the values of `make' variables: instead of editing Makefiles,
     516# (1) if the variable is set in `config.status', edit `config.status'
     517#     (which will cause the Makefiles to be regenerated when you run `make');
     518# (2) otherwise, pass the desired values on the `make' command line.
     519$(RECURSIVE_TARGETS):
     520        @failcom='exit 1'; \
     521        for f in x $$MAKEFLAGS; do \
     522          case $$f in \
     523            *=* | --[!k]*);; \
     524            *k*) failcom='fail=yes';; \
     525          esac; \
     526        done; \
     527        dot_seen=no; \
     528        target=`echo $@ | sed s/-recursive//`; \
     529        list='$(SUBDIRS)'; for subdir in $$list; do \
     530          echo "Making $$target in $$subdir"; \
     531          if test "$$subdir" = "."; then \
     532            dot_seen=yes; \
     533            local_target="$$target-am"; \
     534          else \
     535            local_target="$$target"; \
     536          fi; \
     537          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     538          || eval $$failcom; \
     539        done; \
     540        if test "$$dot_seen" = "no"; then \
     541          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
     542        fi; test -z "$$fail"
     543
     544mostlyclean-recursive clean-recursive distclean-recursive \
     545maintainer-clean-recursive:
     546        @failcom='exit 1'; \
     547        for f in x $$MAKEFLAGS; do \
     548          case $$f in \
     549            *=* | --[!k]*);; \
     550            *k*) failcom='fail=yes';; \
     551          esac; \
     552        done; \
     553        dot_seen=no; \
     554        case "$@" in \
     555          distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
     556          *) list='$(SUBDIRS)' ;; \
     557        esac; \
     558        rev=''; for subdir in $$list; do \
     559          if test "$$subdir" = "."; then :; else \
     560            rev="$$subdir $$rev"; \
     561          fi; \
     562        done; \
     563        rev="$$rev ."; \
     564        target=`echo $@ | sed s/-recursive//`; \
     565        for subdir in $$rev; do \
     566          echo "Making $$target in $$subdir"; \
     567          if test "$$subdir" = "."; then \
     568            local_target="$$target-am"; \
     569          else \
     570            local_target="$$target"; \
     571          fi; \
     572          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
     573          || eval $$failcom; \
     574        done && test -z "$$fail"
     575tags-recursive:
     576        list='$(SUBDIRS)'; for subdir in $$list; do \
     577          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
     578        done
     579ctags-recursive:
     580        list='$(SUBDIRS)'; for subdir in $$list; do \
     581          test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
     582        done
     583
    522584ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    523585        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
     
    530592tags: TAGS
    531593
    532 TAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     594TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    533595                $(TAGS_FILES) $(LISP)
    534596        tags=; \
    535597        here=`pwd`; \
     598        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
     599          include_option=--etags-include; \
     600          empty_fix=.; \
     601        else \
     602          include_option=--include; \
     603          empty_fix=; \
     604        fi; \
     605        list='$(SUBDIRS)'; for subdir in $$list; do \
     606          if test "$$subdir" = .; then :; else \
     607            test ! -f $$subdir/TAGS || \
     608              tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
     609          fi; \
     610        done; \
    536611        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    537612        unique=`for i in $$list; do \
     
    546621        fi
    547622ctags: CTAGS
    548 CTAGS: $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
     623CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    549624                $(TAGS_FILES) $(LISP)
    550625        tags=; \
     
    595670          fi; \
    596671        done
     672        list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
     673          if test "$$subdir" = .; then :; else \
     674            test -d "$(distdir)/$$subdir" \
     675            || $(mkdir_p) "$(distdir)/$$subdir" \
     676            || exit 1; \
     677            distdir=`$(am__cd) $(distdir) && pwd`; \
     678            top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
     679            (cd $$subdir && \
     680              $(MAKE) $(AM_MAKEFLAGS) \
     681                top_distdir="$$top_distdir" \
     682                distdir="$$distdir/$$subdir" \
     683                distdir) \
     684              || exit 1; \
     685          fi; \
     686        done
    597687check-am: all-am
    598 check: check-am
     688check: check-recursive
    599689all-am: Makefile $(LTLIBRARIES) $(HEADERS)
    600 installdirs:
     690installdirs: installdirs-recursive
     691installdirs-am:
    601692        for dir in "$(DESTDIR)$(includedir)"; do \
    602693          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    603694        done
    604 install: install-am
    605 install-exec: install-exec-am
    606 install-data: install-data-am
    607 uninstall: uninstall-am
     695install: install-recursive
     696install-exec: install-exec-recursive
     697install-data: install-data-recursive
     698uninstall: uninstall-recursive
    608699
    609700install-am: all-am
    610701        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    611702
    612 installcheck: installcheck-am
     703installcheck: installcheck-recursive
    613704install-strip:
    614705        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
     
    627718        @echo "This command is intended for maintainers to use"
    628719        @echo "it deletes files that may require special tools to rebuild."
    629 clean: clean-am
     720clean: clean-recursive
    630721
    631722clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    632723        mostlyclean-am
    633724
    634 distclean: distclean-am
     725distclean: distclean-recursive
    635726        -rm -rf ./$(DEPDIR)
    636727        -rm -f Makefile
     
    638729        distclean-libtool distclean-tags
    639730
    640 dvi: dvi-am
     731dvi: dvi-recursive
    641732
    642733dvi-am:
    643734
    644 html: html-am
    645 
    646 info: info-am
     735html: html-recursive
     736
     737info: info-recursive
    647738
    648739info-am:
     
    652743install-exec-am: install-exec-local
    653744
    654 install-info: install-info-am
     745install-info: install-info-recursive
    655746
    656747install-man:
     
    658749installcheck-am:
    659750
    660 maintainer-clean: maintainer-clean-am
     751maintainer-clean: maintainer-clean-recursive
    661752        -rm -rf ./$(DEPDIR)
    662753        -rm -f Makefile
    663754maintainer-clean-am: distclean-am maintainer-clean-generic
    664755
    665 mostlyclean: mostlyclean-am
     756mostlyclean: mostlyclean-recursive
    666757
    667758mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    668759        mostlyclean-libtool
    669760
    670 pdf: pdf-am
     761pdf: pdf-recursive
    671762
    672763pdf-am:
    673764
    674 ps: ps-am
     765ps: ps-recursive
    675766
    676767ps-am:
     
    679770        uninstall-local
    680771
    681 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    682         clean-libtool clean-noinstLTLIBRARIES ctags distclean \
     772uninstall-info: uninstall-info-recursive
     773
     774.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
     775        clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
     776        clean-recursive ctags ctags-recursive distclean \
    683777        distclean-compile distclean-generic distclean-libtool \
    684         distclean-tags distdir dvi dvi-am html html-am info info-am \
    685         install install-am install-data install-data-am install-exec \
    686         install-exec-am install-exec-local install-includeHEADERS \
    687         install-info install-info-am install-man install-strip \
    688         installcheck installcheck-am installdirs maintainer-clean \
    689         maintainer-clean-generic mostlyclean mostlyclean-compile \
    690         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    691         tags uninstall uninstall-am uninstall-includeHEADERS \
    692         uninstall-info-am uninstall-local
     778        distclean-recursive distclean-tags distdir dvi dvi-am html \
     779        html-am info info-am install install-am install-data \
     780        install-data-am install-exec install-exec-am \
     781        install-exec-local install-includeHEADERS install-info \
     782        install-info-am install-man install-strip installcheck \
     783        installcheck-am installdirs installdirs-am maintainer-clean \
     784        maintainer-clean-generic maintainer-clean-recursive \
     785        mostlyclean mostlyclean-compile mostlyclean-generic \
     786        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
     787        tags tags-recursive uninstall uninstall-am \
     788        uninstall-includeHEADERS uninstall-info-am uninstall-local
    693789
    694790
Note: See TracChangeset for help on using the changeset viewer.