dist: don't automatically rebuild doxygen on each make dist

Warn if the doc doesn't exist, or just use what's already there.

contrib/dist/make_dist_tarball takes care of removing/recreating the doc,
and the doc is already correctly rebuilt in most cases, it is built by
make dist when not already available.
No need to keep complex rules for always rebuilding the doc just in case
somebody ever builds a tarball manually and ends up containing an outdated
doc for some reason.

Remove --enable-doxygen from make distcheck now that things are simple.

diff --git a/Makefile.am b/Makefile.am
index 119c1e9778d8a19a3a4bd5757d8253dd5be42c93..45915252d11288734df10720c0b6be483fea0e45 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2009      inria.  All rights reserved.
+# Copyright © 2009-2014 Inria.  All rights reserved.
 # Copyright © 2009      Université Bordeaux 1
 # Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
 # See COPYING in top-level directory.
@@ -44,9 +44,6 @@ EXTRA_DIST = \
 if HWLOC_BUILD_STANDALONE
 dist-hook:
        csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)"
-
-# make sure configure/make-dist during distcheck gets doxygen force-enabled
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-doxygen
 endif HWLOC_BUILD_STANDALONE
 
 #

diff --git a/config/distscript.csh b/config/distscript.csh
index e52822389d44a36bfb121b576a3757d5b607c9d9..ce1e6d69f5ac886fae66a20cf6ed34752ae9b9df 100755 (executable)
--- a/config/distscript.csh
+++ b/config/distscript.csh
@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright © 2010 inria.  All rights reserved.
+# Copyright © 2010-2014   Inria.  All rights reserved.
 # Copyright © 2009-2013 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
@@ -39,14 +39,6 @@ endif
 
 #========================================================================
 
-if ("$srcdir" != "$builddir") then
-    set vpath=1
-    set vpath_msg=yes
-else
-    set vpath=0
-    set vpath_msg=no
-endif
-
 set start=`date`
 cat <<EOF
  
@@ -54,7 +46,6 @@ Creating hwloc distribution
 In directory: `pwd`
 Srcdir: $srcdir
 Builddir: $builddir
-VPATH: $vpath_msg
 Version: $HWLOC_VERSION
 Started: $start
  
@@ -68,52 +59,13 @@ if (! -d "$distdir") then
     exit 1
 endif
 
-#
-# VPATH builds only work if the srcdir has valid docs already built.
-# If we're VPATH and the srcdir doesn't have valid docs, then fail.
-#
-
-if ($vpath == 1 && ! -d $srcdir/doc/doxygen-doc) then
-    echo "*** This is a VPATH 'make dist', but the srcdir does not already"
-    echo "*** have a doxygen-doc tree built.  hwloc's config/distscript.csh"
-    echo "*** requores the docs to be built in the srcdir before executing"
-    echo "*** 'make dist' in a VPATH build."
+if (! -d $srcdir/doc/doxygen-doc) then
+    echo "*** The srcdir does not already have a doxygen-doc tree built."
+    echo "*** hwloc's config/distscript.csh requires the docs to be built"
+    echo "*** in the srcdir before executing 'make dist'."
     exit 1
 endif
 
-#
-# If we're not VPATH, force the generation of new doxygen documentation
-#
-
-if ($vpath == 0) then
-    # Not VPATH
-    echo "*** Making new doxygen documentation (doxygen-doc tree)"
-    echo "*** Directory: srcdir: $srcdir, distdir: $distdir, pwd: `pwd`"
-    cd doc
-    # We're still in the src tree, so kill any previous doxygen-docs
-    # tree and make a new one.
-    chmod -R a=rwx doxygen-doc
-    rm -rf doxygen-doc
-    make
-    if ($status != 0) then
-        echo ERROR: generating doxygen docs failed
-        echo ERROR: cannot continue
-        exit 1
-    endif
-
-    # Make new README file
-    echo "*** Making new README"
-    make readme
-    if ($status != 0) then
-        echo ERROR: generating new README failed
-        echo ERROR: cannot continue
-        exit 1
-    endif
-else
-    echo "*** This is a VPATH build; assuming that the doxygen docs and REAME"
-    echo "*** are current in the srcdir (i.e., we'll just copy those)"
-endif
-
 echo "*** Copying doxygen-doc tree to dist..."
 echo "*** Directory: srcdir: $srcdir, distdir: $distdir, pwd: `pwd`"
 chmod -R a=rwx $distdir/doc/doxygen-doc