build infrastructure for new doc target

fdkong · Oct 22, 2014 · 15b3774 · 15b3774
1 parent b664c40
commit 15b3774
Show file tree

Hide file tree

Showing 10 changed files with 1,425 additions and 22 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -482,8 +482,11 @@ if LIBMESH_ENABLE_EXAMPLES
   SUBDIRS += examples
 endif
 
-#
-.PHONY: examples_doc doc svnexpand
+###########################################################
+# Documentation
+.PHONY: examples_doc doc
+
+SUBDIRS += doc
 
 #
 # documentation for the examples

diff --git a/Makefile.in b/Makefile.in
@@ -75,9 +75,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(top_srcdir)/contrib/utils/libmesh-devel.pc.in \
 	$(top_srcdir)/contrib/utils/libmesh-oprof.pc.in \
 	$(top_srcdir)/contrib/utils/libmesh-opt.pc.in \
-	$(top_srcdir)/contrib/utils/libmesh-prof.pc.in \
-	$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/dot.in AUTHORS \
-	COPYING ChangeLog INSTALL NEWS build-aux/compile \
+	$(top_srcdir)/contrib/utils/libmesh-prof.pc.in AUTHORS COPYING \
+	ChangeLog INSTALL NEWS build-aux/compile \
 	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
 	build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
 	build-aux/ylwrap
@@ -142,11 +141,11 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/libmesh_config.h.tmp
 CONFIG_CLEAN_FILES = contrib/utils/Makefile contrib/utils/Make.common \
-	doc/Doxyfile contrib/utils/libmesh.pc \
-	contrib/utils/libmesh-opt.pc contrib/utils/libmesh-dbg.pc \
-	contrib/utils/libmesh-devel.pc contrib/utils/libmesh-prof.pc \
-	contrib/utils/libmesh-oprof.pc contrib/bin/libmesh-config \
-	contrib/bin/xda2mgf contrib/bin/create_libmesh_release doc/dot
+	contrib/utils/libmesh.pc contrib/utils/libmesh-opt.pc \
+	contrib/utils/libmesh-dbg.pc contrib/utils/libmesh-devel.pc \
+	contrib/utils/libmesh-prof.pc contrib/utils/libmesh-oprof.pc \
+	contrib/bin/libmesh-config contrib/bin/xda2mgf \
+	contrib/bin/create_libmesh_release
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -4124,7 +4123,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = include contrib tests examples
+DIST_SUBDIRS = include contrib tests examples doc
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -4477,7 +4476,7 @@ vtkversion = @vtkversion@
 #          test/common/Makefile.in                  \
 #          test/comp_ns/Makefile.in                 \
 #          test/unit/Makefile.in
-SUBDIRS = include contrib $(am__append_6) $(am__append_10)
+SUBDIRS = include contrib $(am__append_6) $(am__append_10) doc
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = $(libmesh_CFLAGS)
@@ -5258,8 +5257,6 @@ contrib/utils/Makefile: $(top_builddir)/config.status $(top_srcdir)/contrib/util
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 contrib/utils/Make.common: $(top_builddir)/config.status $(top_srcdir)/contrib/utils/Make.common.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-doc/Doxyfile: $(top_builddir)/config.status $(top_srcdir)/doc/Doxyfile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 contrib/utils/libmesh.pc: $(top_builddir)/config.status $(top_srcdir)/contrib/utils/libmesh-opt.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 contrib/utils/libmesh-opt.pc: $(top_builddir)/config.status $(top_srcdir)/contrib/utils/libmesh-opt.pc.in
@@ -5278,8 +5275,6 @@ contrib/bin/xda2mgf: $(top_builddir)/config.status $(top_srcdir)/contrib/bin/xda
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 contrib/bin/create_libmesh_release: $(top_builddir)/config.status $(top_srcdir)/contrib/bin/create_libmesh_release.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-doc/dot: $(top_builddir)/config.status $(top_srcdir)/doc/dot.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -28707,8 +28702,9 @@ beautify:
           emacs -batch $$file --eval '(delete-trailing-whitespace)' -f save-buffer 2>/dev/null ; \
         done
 
-#
-.PHONY: examples_doc doc svnexpand
+###########################################################
+# Documentation
+.PHONY: examples_doc doc
 
 #
 # documentation for the examples

diff --git a/configure b/configure
@@ -3700,7 +3700,7 @@ test -n "$target_alias" &&
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
-ac_config_files="$ac_config_files Makefile include/Makefile include/libmesh/Makefile contrib/Makefile contrib/utils/Makefile contrib/utils/Make.common tests/Makefile doc/Doxyfile contrib/utils/libmesh.pc:contrib/utils/libmesh-opt.pc.in contrib/utils/libmesh-opt.pc contrib/utils/libmesh-dbg.pc contrib/utils/libmesh-devel.pc contrib/utils/libmesh-prof.pc contrib/utils/libmesh-oprof.pc"
+ac_config_files="$ac_config_files Makefile include/Makefile include/libmesh/Makefile contrib/Makefile contrib/utils/Makefile contrib/utils/Make.common tests/Makefile contrib/utils/libmesh.pc:contrib/utils/libmesh-opt.pc.in contrib/utils/libmesh-opt.pc contrib/utils/libmesh-dbg.pc contrib/utils/libmesh-devel.pc contrib/utils/libmesh-prof.pc contrib/utils/libmesh-oprof.pc doc/Doxyfile doc/Makefile doc/html/Makefile"
 
 
 ac_config_files="$ac_config_files contrib/bin/libmesh-config"
@@ -37101,13 +37101,15 @@ do
     "contrib/utils/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/utils/Makefile" ;;
     "contrib/utils/Make.common") CONFIG_FILES="$CONFIG_FILES contrib/utils/Make.common" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-    "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
     "contrib/utils/libmesh.pc") CONFIG_FILES="$CONFIG_FILES contrib/utils/libmesh.pc:contrib/utils/libmesh-opt.pc.in" ;;
     "contrib/utils/libmesh-opt.pc") CONFIG_FILES="$CONFIG_FILES contrib/utils/libmesh-opt.pc" ;;
     "contrib/utils/libmesh-dbg.pc") CONFIG_FILES="$CONFIG_FILES contrib/utils/libmesh-dbg.pc" ;;
     "contrib/utils/libmesh-devel.pc") CONFIG_FILES="$CONFIG_FILES contrib/utils/libmesh-devel.pc" ;;
     "contrib/utils/libmesh-prof.pc") CONFIG_FILES="$CONFIG_FILES contrib/utils/libmesh-prof.pc" ;;
     "contrib/utils/libmesh-oprof.pc") CONFIG_FILES="$CONFIG_FILES contrib/utils/libmesh-oprof.pc" ;;
+    "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;;
     "contrib/bin/libmesh-config") CONFIG_FILES="$CONFIG_FILES contrib/bin/libmesh-config" ;;
     "contrib/bin/xda2mgf") CONFIG_FILES="$CONFIG_FILES contrib/bin/xda2mgf" ;;
     "contrib/bin/create_libmesh_release") CONFIG_FILES="$CONFIG_FILES contrib/bin/create_libmesh_release" ;;

diff --git a/configure.ac b/configure.ac
@@ -40,13 +40,15 @@ AC_CONFIG_FILES([Makefile
                  contrib/utils/Makefile
                  contrib/utils/Make.common
                  tests/Makefile
-                 doc/Doxyfile
                  contrib/utils/libmesh.pc:contrib/utils/libmesh-opt.pc.in
                  contrib/utils/libmesh-opt.pc
                  contrib/utils/libmesh-dbg.pc
                  contrib/utils/libmesh-devel.pc
                  contrib/utils/libmesh-prof.pc
                  contrib/utils/libmesh-oprof.pc
+                 doc/Doxyfile
+                 doc/Makefile
+                 doc/html/Makefile
                  ])
 
 AC_CONFIG_FILES(contrib/bin/libmesh-config,          [chmod +x contrib/bin/libmesh-config])

diff --git a/contrib/qhull/2012.1/config/Makefile.in b/contrib/qhull/2012.1/config/Makefile.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = html