Changeset 3482

Show
Ignore:
Timestamp:
2/12/2009 3:52:23 PM (9 months ago)
Author:
amerzky
Message:

scattered commits, nothing important really
A

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • saga/trunk/adaptors/default/url/local_url.cpp

    r3470 r3482  
    8080/////////////////////////////////////////////////////////////////////////////// 
    8181} 
     82 

  • saga/trunk/make/saga.adaptor.mk

    r2775 r3482  
    4848 
    4949 
    50 ifdef SAGA_ROOT 
    51   TMP_MAKE_INCLUDES = $(foreach preq,$(TMP_PACKAGE_REQS),$(SAGA_ROOT)/make/saga.$(preq).i.mk) 
    52 else 
    53   TMP_MAKE_INCLUDES = $(foreach preq,$(TMP_PACKAGE_REQS),$(SAGA_ROOT)/make/saga.$(preq).mk) 
    54 endif 
     50TMP_MAKE_INCLUDES = $(foreach preq,$(TMP_PACKAGE_REQS),$(SAGA_MAKE_INCLUDE_ROOT)/saga.$(preq).i.mk) 
    5551 
    5652TMP_MAKE_INCLUDES  += $(foreach ereq,$(TMP_EXTERNAL_REQS),$(SAGA_CONFDIR)/saga.config.$(ereq).c.mk) 
    …… 
    6157  endif 
    6258endif 
     59 
     60# include for generating adaptor docs 
     61include $(SAGA_MAKE_INCLUDE_ROOT)/saga.doc.mk 
    6362 
    6463 

  • saga/trunk/saga/saga/metric.hpp

    r3232 r3482  
    133133      * 
    134134      */ 
     135     // FIXME: the spec does not say anything about a target object parameter. 
     136     // In fact, a metric should be usable on multiple objects.  For example, an 
     137     // application may want to add the same metrics to several steerable 
     138     // job instances. 
    135139     metric (saga::object target,  
    136140             std::string name, std::string desc, std::string mode,