Drop support for PAR=-j?, since gmakes before 3.78 seem to be no more in use. Nicer...

git-svn-id: https://svn.dealii.org/trunk@5637 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/Makefile b/deal.II/Makefile
index 48a0d42d06e239f6230f973000b4391b4d85cbed..864f16493b33651f144120bd17eea75e3deb555b 100644 (file)
--- a/deal.II/Makefile
+++ b/deal.II/Makefile
@@ -7,32 +7,29 @@ include common/Make.global_options
 
 
 help:
-       @echo "======================================================================"
-       @echo "=Global Makefile for the deal.II libraries                           ="
-       @echo "======================================================================"
-       @echo "=Possible Targets                                                    ="
-       @echo "=  baseg lacg: debug libraries base and lac                          ="
-       @echo "=  base lac: debug and optimized libraries base and lac              ="
-       @echo "=  1dg 2dg 3dg: (1) and deal.II debug version for specified dimension="
-       @echo "=  1d 2d 3d: (2) and deal.II for specified dimension                 ="
-       @echo "=  contrib: make additional libraries in contrib, if there are any   ="
-       @echo "=  all: base, lac, 1d, 2d and 3d, contrib                            ="
-       @echo "=  debug: baseg, lacg, 1dg, 2dg and 3dg, contrib                     ="
-       @echo "=  optimized: base, lac, 1d, 2d, and 3d optimized libraries only     ="
-       @echo "=  online-doc: generate the documentation in HTML format             ="
-       @echo "=  TODO: create a TODO file from TODO lines in the source files      ="
-       @echo "=  TAGS: create a TAGS file from include and source files            ="
-       @echo "=  clean: removes all object files, libraries, etc in all subdirs    ="
-       @echo "=                                                                    ="
-       @echo "=The following additional parameters may be specified to make:       ="
-       @echo "=  PAR=-jn where n is the number of parallel processes for parallel  ="
-       @echo "=          builds. If you use GNU make 3.78 or higher, you can       ="
-       @echo "=          call 'make -jn' directly. This parameter is no more       ="
-       @echo "=          necessary then.                                           ="
-       @echo "======================================================================"
-
-
-MAKEOPTIONS = $(PAR)
+       @echo "========================================================================"
+       @echo "=              Global Makefile for the deal.II libraries               ="
+       @echo "========================================================================"
+       @echo "=                                                                      ="
+       @echo "= The following targets exist:                                         ="
+       @echo "=    baseg lacg : debug libraries \"base\" and \"lac\"                     ="
+       @echo "=    base lac   : debug and optimized libraries \"base\" and \"lac\"       ="
+       @echo "=    1dg 2dg 3dg: deal.II debug version for specified dimension        ="
+       @echo "=    1d 2d 3d   : deal.II debug and optimized for specified dimension  ="
+       @echo "=                                                                      ="
+       @echo "=    contrib    : additional libraries in contrib, if there are any    ="
+       @echo "=                                                                      ="
+       @echo "=    all        : base, lac, 1d, 2d and 3d, contrib                    ="
+       @echo "=    debug      : baseg, lacg, 1dg, 2dg and 3dg, contrib               ="
+       @echo "=    optimized  : base, lac, 1d, 2d, and 3d optimized libraries only   ="
+       @echo "=                                                                      ="
+       @echo "=    online-doc : generate the documentation in HTML format            ="
+       @echo "=    TODO       : create a \"TODO\" file from the source files           ="
+       @echo "=    TAGS       : create a TAGS file from include and source files     ="
+       @echo "=                                                                      ="
+       @echo "=    clean      : removes all object files, libraries, etc in subdirs  ="
+       @echo "========================================================================"
+
 
 
 baseg: