From f141b0283ef2070f2454b8ae0ac6b84f98ca10e4 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 4 Nov 2010 03:21:24 +0000 Subject: [PATCH] Revamp the whole business. git-svn-id: https://svn.dealii.org/trunk@22600 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/development/Makefile | 2 + deal.II/doc/development/Makefile.large | 10 ++- deal.II/doc/development/Makefile.small | 6 +- deal.II/doc/development/makefiles.1.html | 10 +-- deal.II/doc/development/makefiles.2.html | 90 +++++++++--------------- 5 files changed, 47 insertions(+), 71 deletions(-) diff --git a/deal.II/doc/development/Makefile b/deal.II/doc/development/Makefile index 45e62ee95f..1cc3129739 100644 --- a/deal.II/doc/development/Makefile +++ b/deal.II/doc/development/Makefile @@ -119,6 +119,8 @@ 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 "

" >> $@ + @echo "" >> $@ + @echo "" >> $@ @echo $(VARIABLE_VALUES) >> $@ @echo "
Makefile variableValue in common/Make.global_options

" >> $@ @cat makefiles.2.html >> $@ diff --git a/deal.II/doc/development/Makefile.large b/deal.II/doc/development/Makefile.large index 8fbaffd55a..ad99445874 100644 --- a/deal.II/doc/development/Makefile.large +++ b/deal.II/doc/development/Makefile.large @@ -4,13 +4,10 @@ # projects. Basically, only the following seven parameters need to be # set by you: -application-name = waves - -# The first denotes the dimension for which the program is to be -# compiled: +application-name = waves deal_II_dimension = 2 -# The second tells us the name of the executable. It is prefixed by +# The next variable tells us the name of the executable. It is prefixed by # `lib/' to designate its destination directory. Note that the program # name depends on the dimension, so you can keep copies for the # different dimensions around: @@ -20,7 +17,8 @@ target = lib/$(application-name)-$(deal_II_dimension)d debug-mode = on # And so does the following variable. You will have to set it to -# something more reasonable, of course. +# something reasonable that, for example, includes the location where you +# put output files that you want the `make clean' rule to delete clean-up-files = # Finally, here is a variable which tells the `run' rule which diff --git a/deal.II/doc/development/Makefile.small b/deal.II/doc/development/Makefile.small index ee81d35de8..2b634d6364 100644 --- a/deal.II/doc/development/Makefile.small +++ b/deal.II/doc/development/Makefile.small @@ -30,7 +30,7 @@ D = ../../ # shall be deleted when calling `make clean'. Object and backup files, # executables and the like are removed anyway. Here, we give a list of # files in the various output formats that deal.II supports. -clean-up-files = *gmv *gnuplot *gpl *eps *pov +clean-up-files = *gmv *gnuplot *gpl *eps *pov *vtk *ucd *d2 @@ -40,7 +40,7 @@ clean-up-files = *gmv *gnuplot *gpl *eps *pov # Usually, you will not need to change anything beyond this point. # # -# The next statement tell the `make' program where to find the +# The next statement tells the `make' program where to find the # deal.II top level directory and to include the file with the global # settings include $D/common/Make.global_options @@ -55,7 +55,7 @@ libs.g := $(lib-deal2.g) libs.o := $(lib-deal2.o) -# We now use the variable defined above which switch between debug and +# We now use the variable defined above to switch between debug and # optimized mode to select the set of libraries to link with. Included # in the list of libraries is the name of the object file which we # will produce from the single C++ file. Note that by default we use diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html index 8000fdf28a..cbf3d19d40 100644 --- a/deal.II/doc/development/makefiles.1.html +++ b/deal.II/doc/development/makefiles.1.html @@ -17,18 +17,18 @@ include it. You will want to include this file into the Makefiles of your project to use the same compiler flags and to access the paths to libraries. This page documents available - flags, documents the values which are used + variables, documents the values which are used in your local installation, and shows generic Makefiles which you may want to use in your own projects.

-

Available flags

+

Available variables

- Following is a partial list of available flags which are exported to - other Makefiles. There are additional flags, in particular ones that + Following is a partial list of available variables which are exported to + other Makefiles. There are additional variables, in particular ones that determine the interaction with other libraries such as PETSc, Trilinos, METIS, etc; for details on these variables, take a look at common/Make.global_options. @@ -377,7 +377,7 @@ -

Values of available flags

+

Values of available variables

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 diff --git a/deal.II/doc/development/makefiles.2.html b/deal.II/doc/development/makefiles.2.html index 00045b76b6..970f45b97a 100644 --- a/deal.II/doc/development/makefiles.2.html +++ b/deal.II/doc/development/makefiles.2.html @@ -3,37 +3,25 @@

Generic Makefiles

- In this section, we provide templates for Makefiles for - applications based on the deal.II - libraries. They show how to use the information provided by the - variables explained above. + deal.II comes with sample Makefiles for + applications that use this library. They show how to use the information + provided by the variables explained above.

- At present, we have three Makefiles, one for small projects - consisting of only one C++ file, and one for large projects. - Furthermore, there is a Makefile in a different style. Have - a look at them and see what seem convenient to you. All Makefiles + At present, there are two such Makefile templates. All Makefiles need slight modifications before they will work in your - project. The places for modifications are marked. + project; the places for modifications are marked and easy to find. The + templates are:


-- 2.39.5