merge trunk

configure.ac

@@ -2170,9 +2170,9 @@ AC_ARG_ENABLE(build-doc, [AS_HELP_STRING([--disable-build-doc],
 			[disable building of documentation])],
 			enable_build_doc=$enableval, enable_build_doc=yes)
 
-# Check whether texi2dvi is installed
-AC_PATH_PROG(texi2dvicommand, texi2dvi)
-if test "$texi2dvicommand" = "" ; then
+# Check whether doxygen is installed
+AC_PATH_PROG(doxygencommand, doxygen)
+if test "$doxygencommand" = "" ; then
 	enable_build_doc="no"
 fi
 

doc/doxygen/chapters/environment_variables.doxy

@@ -150,15 +150,15 @@ and \ref STARPU_MAX_WORKERSIZE can be used to change this default.
 <dd>
 \anchor STARPU_MIN_WORKERSIZE
 \addindex __env__STARPU_MIN_WORKERSIZE
-When \ref STARPU_SINGLE_COMBINED_WORKER is set, \ref STARPU_MIN_WORKERSIZE
-permits to specify the minimum size of the combined workers (instead of the default 1)
+\ref STARPU_MIN_WORKERSIZE
+permits to specify the minimum size of the combined workers (instead of the default 2)
 </dd>
 
 <dt>STARPU_MAX_WORKERSIZE</dt>
 <dd>
 \anchor STARPU_MAX_WORKERSIZE
 \addindex __env__STARPU_MAX_WORKERSIZE
-When \ref STARPU_SINGLE_COMBINED_WORKER is set, \ref STARPU_MAX_WORKERSIZE
+\ref STARPU_MAX_WORKERSIZE
 permits to specify the minimum size of the combined workers (instead of the
 number of CPU workers in the system)
 </dd>

doc/doxygen/doxygen-config.cfg.in

@@ -19,7 +19,37 @@
 INPUT                  = @top_srcdir@/doc/doxygen/chapters \
 		       	 @top_srcdir@/doc/doxygen/chapters/api \
                          @top_builddir@/doc/doxygen/starpu_config.h \
-			 @top_srcdir@/include/ \
+	 		 @top_srcdir@/include/starpu_bound.h \
+			 @top_srcdir@/include/starpu_cublas.h \
+			 @top_srcdir@/include/starpu_cuda.h \
+			 @top_srcdir@/include/starpu_data_filters.h \
+			 @top_srcdir@/include/starpu_data.h \
+			 @top_srcdir@/include/starpu_data_interfaces.h \
+			 @top_srcdir@/include/starpu_deprecated_api.h \
+			 @top_srcdir@/include/starpu_driver.h \
+			 @top_srcdir@/include/starpu_expert.h \
+			 @top_srcdir@/include/starpu_fxt.h \
+			 @top_srcdir@/include/starpu.h \
+			 @top_srcdir@/include/starpu_hash.h \
+			 @top_srcdir@/include/starpu_mic.h \
+			 @top_srcdir@/include/starpu_opencl.h \
+			 @top_srcdir@/include/starpu_perfmodel.h \
+			 @top_srcdir@/include/starpu_profiling.h \
+			 @top_srcdir@/include/starpu_rand.h \
+			 @top_srcdir@/include/starpu_scc.h \
+			 @top_srcdir@/include/starpu_sched_ctx.h \
+			 @top_srcdir@/include/starpu_scheduler.h \
+			 @top_srcdir@/include/starpu_sink.h \
+			 @top_srcdir@/include/starpu_stdlib.h \
+			 @top_srcdir@/include/starpu_task_bundle.h \
+			 @top_srcdir@/include/starpu_task.h \
+			 @top_srcdir@/include/starpu_task_list.h \
+			 @top_srcdir@/include/starpu_task_util.h \
+			 @top_srcdir@/include/starpu_thread.h \
+			 @top_srcdir@/include/starpu_thread_util.h \
+			 @top_srcdir@/include/starpu_top.h \
+			 @top_srcdir@/include/starpu_util.h \
+			 @top_srcdir@/include/starpu_worker.h \
 			 @top_srcdir@/mpi/include/ \
 			 @top_srcdir@/starpufft/starpufft.h \
 			 @top_srcdir@/sc_hypervisor/include
@@ -32,4 +62,3 @@ INPUT_FILTER           = @top_builddir@/doc/doxygen/doxygen_filter.sh
 
 LATEX_HEADER           = @top_srcdir@/doc/doxygen/refman.tex
 
-EXCLUDE_PATTERNS       = @abs_top_builddir@/include/starpu_config.h

doc/doxygen/doxygen.cfg

@@ -739,8 +739,7 @@ EXCLUDE_SYMLINKS       = NO
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-#defined in doxygen-config.cfg
-#EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the