From: bangerth Date: Mon, 1 Nov 2010 13:09:34 +0000 (+0000) Subject: Rework and pretty up. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16d3b7ac6b45db7ad3d1d96e73f3ac2e01b39ca6;p=dealii-svn.git Rework and pretty up. git-svn-id: https://svn.dealii.org/trunk@22569 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/development/Makefile b/deal.II/doc/development/Makefile index 8fa9834712..45e62ee95f 100644 --- a/deal.II/doc/development/Makefile +++ b/deal.II/doc/development/Makefile @@ -8,73 +8,119 @@ include $D/common/Make.global_options default: makefiles.html makefile.small.html makefile.large.html makefile.rules.html +# Have a list of variables defined in common/Make.global_options and expand them into +# something that looks decent in HTML. The special text "--break--" draws a horizontal +# line to separate different blocks of variables +VARIABLES = D DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR \ + --break-- \ + CXX GXX-VERSION GXX-VERSION-DETAILED \ + CC CC-VERSION \ + F77 F77-VERSION \ + SHLIBLD \ + AR \ + RANLIB \ + PERL \ + TARGET \ + --break-- \ + LIBPATH \ + LIBDIR \ + LIBS \ + OBJEXT EXEEXT static-lib-suffix shared-lib-suffix \ + lib-suffix \ + --break-- \ + lib-deal2.o \ + lib-deal2.g \ + --break-- \ + INCLUDE \ + CXXFLAGS.g \ + CXXFLAGS.o \ + CFLAGS.g \ + CFLAGS.o \ + F77FLAGS.g \ + F77FLAGS.o \ + SHLIBFLAGS \ + LDFLAGS \ + F77LIBS \ + --break-- \ + enable-shared \ + enable-parser \ + DEAL_II_USE_MPI \ + --break-- \ + enable-threads \ + lib-contrib-tbb.g \ + lib-contrib-tbb.o \ + --break-- \ + USE_CONTRIB_UMFPACK \ + --break-- \ + USE_CONTRIB_HSL \ + lib-contrib-hsl \ + --break-- \ + USE_CONTRIB_PETSC \ + DEAL_II_PETSC_DIR \ + DEAL_II_PETSC_ARCH \ + DEAL_II_PETSC_VERSION_MAJOR \ + DEAL_II_PETSC_VERSION_MINOR \ + DEAL_II_PETSC_VERSION_SUBMINOR \ + DEAL_II_PETSC_MPIUNI_LIB \ + lib-contrib-petsc.g \ + lib-contrib-petsc.o \ + include-path-petsc \ + include-path-petsc-bmake \ + --break-- \ + USE_CONTRIB_SLEPC \ + DEAL_II_SLEPC_DIR \ + DEAL_II_SLEPC_VERSION_MAJOR \ + DEAL_II_SLEPC_VERSION_MINOR \ + DEAL_II_SLEPC_VERSION_SUBMINOR \ + lib-contrib-slepc \ + include-path-slepc \ + --break-- \ + USE_CONTRIB_TRILINOS \ + DEAL_II_TRILINOS_INCDIR \ + DEAL_II_TRILINOS_LIBDIR \ + DEAL_II_TRILINOS_SHARED \ + DEAL_II_TRILINOS_STATIC \ + DEAL_II_TRILINOS_VERSION_MAJOR \ + DEAL_II_TRILINOS_VERSION_MINOR \ + DEAL_II_TRILINOS_VERSION_SUBMINOR \ + lib-contrib-trilinos \ + include-path-trilinos \ + --break-- \ + USE_CONTRIB_MUMPS \ + DEAL_II_MUMPS_DIR \ + DEAL_II_SCALAPACK_DIR \ + DEAL_II_BLACS_DIR \ + DEAL_II_BLACS_ARCH \ + lib-contrib-mumps \ + include-path-mumps \ + --break-- \ + USE_CONTRIB_ARPACK \ + DEAL_II_ARPACK_DIR \ + DEAL_II_ARPACK_ARCH \ + lib-contrib-arpack \ + --break-- \ + USE_CONTRIB_METIS \ + DEAL_II_METIS_DIR \ + lib-contrib-metis \ + include-path-contrib-metis \ + --break-- \ + USE_CONTRIB_P4EST \ + DEAL_II_P4EST_DIR \ + --break-- \ + TECIO_INCLUDE \ + TECIO_LIBRARY + +expand_variable = $(if $(1:--break--=), \ + '$$($1) $($1)',\ + '
') + +VARIABLE_VALUES = $(foreach v,$(VARIABLES),$(call expand_variable,$v)) + makefiles.html: Makefile makefiles.1.html $D/common/Make.global_options makefiles.2.html @cat makefiles.1.html > $@ - @echo '
  • D=$D' >> $@ - @echo '
  • CXX=$(CXX)' >> $@ - @echo '
  • CC=$(CC)' >> $@ - @echo '
  • F77=$(F77)' >> $@ - @echo '
  • GXX-VERSION=$(GXX-VERSION)' >> $@ - @echo '
  • GXX-VERSION-DETAILED=$(GXX-VERSION-DETAILED)' >> $@ - @echo '
  • CC-VERSION=$(CC-VERSION)' >> $@ - @echo '
  • F77-VERSION=$(F77-VERSION)' >> $@ - @echo '
  • SHLIBLD=$(SHLIBLD)' >> $@ - @echo '
  • OBJEXT=$(OBJEXT)' >> $@ - @echo '
  • EXEEXT=$(EXEEXT)' >> $@ - @echo '
  • enable-shared=$(enable-shared)' >> $@ - @echo '
  • PERL=$(PERL)' >> $@ - @echo '
  • DEAL_II_MAJOR=$(DEAL_II_MAJOR)' >> $@ - @echo '
  • DEAL_II_MINOR=$(DEAL_II_MINOR)' >> $@ - @echo '
  • TARGET=$(TARGET)' >> $@ - @echo '
  • USE_CONTRIB_HSL=$(USE_CONTRIB_HSL)' >> $@ - @echo '
  • USE_CONTRIB_PETSC=$(USE_CONTRIB_PETSC)' >> $@ - @echo '
  • DEAL_II_PETSC_DIR=$(DEAL_II_PETSC_DIR)' >> $@ - @echo '
  • DEAL_II_PETSC_ARCH=$(DEAL_II_PETSC_ARCH)' >> $@ - @echo '
  • USE_CONTRIB_METIS=$(USE_CONTRIB_METIS)' >> $@ - @echo '
  • DEAL_II_METIS_DIR=$(DEAL_II_METIS_DIR)' >> $@ - @echo '
  • lib-path-base=$(lib-path-base)' >> $@ - @echo '
  • lib-path-lac=$(lib-path-lac)' >> $@ - @echo '
  • lib-path-deal2=$(lib-path-deal2)' >> $@ - @echo '
  • LIBPATH=$(LIBPATH)' >> $@ - @echo '
  • LIBS=$(LIBS)' >> $@ - @echo '
  • static-lib-suffix=$(static-lib-suffix)' >> $@ - @echo '
  • shared-lib-suffix=$(shared-lib-suffix)' >> $@ - @echo '
  • lib-suffix=$(lib-suffix)' >> $@ - @echo '
  • lib-base.o=$(lib-base.o)' >> $@ - @echo '
  • lib-base.g=$(lib-base.g)' >> $@ - @echo '
  • lib-lac.o=$(lib-lac.o)' >> $@ - @echo '
  • lib-lac.g=$(lib-lac.g)' >> $@ - @echo '
  • lib-deal2-1d.o=$(lib-deal2-1d.o)' >> $@ - @echo '
  • lib-deal2-1d.g=$(lib-deal2-1d.g)' >> $@ - @echo '
  • lib-deal2-2d.o=$(lib-deal2-2d.o)' >> $@ - @echo '
  • lib-deal2-2d.g=$(lib-deal2-2d.g)' >> $@ - @echo '
  • lib-deal2-3d.o=$(lib-deal2-3d.o)' >> $@ - @echo '
  • lib-deal2-3d.g=$(lib-deal2-3d.g)' >> $@ - @echo '
  • lib-contrib-hsl=$(lib-contrib-hsl)' >> $@ - @echo '
  • lib-contrib-petsc.g=$(lib-contrib-petsc.g)' >> $@ - @echo '
  • lib-contrib-petsc.o=$(lib-contrib-petsc.o)' >> $@ - @echo '
  • lib-contrib-metis=$(lib-contrib-metis)' >> $@ - @echo '
  • include-path-base=$(include-path-base)' >> $@ - @echo '
  • include-path-lac=$(include-path-lac)' >> $@ - @echo '
  • include-path-deal2=$(include-path-deal2)' >> $@ - @echo '
  • include-path-contrib-hsl=$(include-path-contrib-hsl)' >> $@ - @echo '
  • include-path-contrib-petsc=$(include-path-contrib-petsc)' >> $@ - @echo '
  • include-path-contrib-petsc-bmake=$(include-path-contrib-petsc-bmake)' >> $@ - @echo '
  • include-path-contrib-metis=$(include-path-contrib-metis)' >> $@ - @echo '
  • INCLUDE=$(INCLUDE)' >> $@ - @echo '
  • CXXFLAGS.g=$(CXXFLAGS.g)' >> $@ - @echo '
  • CXXFLAGS.o=$(CXXFLAGS.o)' >> $@ - @echo '
  • CFLAGS.g=$(CFLAGS.g)' >> $@ - @echo '
  • CFLAGS.o=$(CFLAGS.o)' >> $@ - @echo '
  • F77FLAGS.g=$(F77FLAGS.g)' >> $@ - @echo '
  • F77FLAGS.o=$(F77FLAGS.o)' >> $@ - @echo '
  • LDFLAGS=$(LDFLAGS)' >> $@ - @echo '
  • F77LIBS=$(F77LIBS)' >> $@ - @echo '
  • ACE_ROOT=$(ACE_ROOT)' >> $@ - @echo '
  • lib-ACE=$(lib-ACE)' >> $@ - @echo '
  • enable-threads=$(enable-threads)' >> $@ - @echo '
  • TECIO_INCLUDE=$(TECIO_INCLUDE)' >> $@ - @echo '
  • TECIO_LIBRARY=$(TECIO_LIBRARY)' >> $@ + @echo "

    " >> $@ + @echo $(VARIABLE_VALUES) >> $@ + @echo "

    " >> $@ @cat makefiles.2.html >> $@ diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html index 4fef34dfc2..8000fdf28a 100644 --- a/deal.II/doc/development/makefiles.1.html +++ b/deal.II/doc/development/makefiles.1.html @@ -381,8 +381,7 @@ In the copy of the library to which the file which you are presently viewing belongs (i.e., your local one, or the one on the - deal.II homepage), the flags documented above have the - following values: + deal.II homepage), here is a list of some of the + variables defined in common/Make.global_options: -

    Generic Makefiles