Update documentation

diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt
index 578d1f8e6c355d2aa68a7df2bf0d4c65e6895361..26e582ee8a8e9bc1a96d9465774b82cd84f6b2b5 100644 (file)
--- a/cmake/config/CMakeLists.txt
+++ b/cmake/config/CMakeLists.txt
@@ -171,11 +171,7 @@ SET(_files
   ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake
   ${CMAKE_CURRENT_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_NAME}Config.cmake
   )
-SET(_makefiles
-  ${CMAKE_BINARY_DIR}/${DEAL_II_SHARE_RELDIR}/Make.global_options
-  ${CMAKE_CURRENT_BINARY_DIR}/Make.global_options
-  )
-FOREACH(_file ${_files} ${_makefiles})
+FOREACH(_file ${_files})
   FILE(APPEND ${_file} "\n\n#\n# Feature configuration:\n#\n\n")
 ENDFOREACH()
 

diff --git a/doc/developers/cmake-internals.html b/doc/developers/cmake-internals.html
index 4c29722b2a171198ccac6f3be67463fb8c0cc566..8004f8fc6f7ce6ae4fb79249050bf256f1feb622 100644 (file)
--- a/doc/developers/cmake-internals.html
+++ b/doc/developers/cmake-internals.html
@@ -695,9 +695,8 @@ EXPAND_INSTANTIATIONS(obj_dofs "${inst_in_files}")
 
 <p>
   The final bits of configuration happens in
-  <code>./cmake/config/CMakeLists.txt</code> where the templates for
-  the project configuration <code>deal.IIConfig.cmake</code> and the
-  compatibility file <code>Make.global_options</code> get expanded.
+  <code>./cmake/config/CMakeLists.txt</code> where the templates for the
+  project configuration <code>deal.IIConfig.cmake</code> gets expanded.
   Furthermore, the configuration for the template expansion mechanism
   resides under <code>./cmake/config/template_arguments.in</code>.
 </p>

diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html
index 77e14a3cdc72473616017e3fed8eb2c758f1ac0c..ecc73de2a80432bc5c6cd971a6391374f5aaf701 100644 (file)
--- a/doc/users/cmakelists.html
+++ b/doc/users/cmakelists.html
@@ -47,7 +47,6 @@
     </li>
     <li><a href="#cmakeauto">Autopilot style <code>CMakeLists.txt</code></li>
     <li><a href="#dealiiconfig"><code>deal.IIConfig.cmake</code></a></li>
-    <li><a href="#makeconfig"><code>Make.global_options</code></a></li>
   </ol>
 </div>
 
@@ -863,25 +862,13 @@ DEAL_II_WITH_UMFPACK
 DEAL_II_WITH_ZLIB
 </pre>
 
-<a name="makeconfig"></a>
-<h2>  <code>Make.global_options</code> </h2>
-
-<p>
-  The above CMake configuration file <code>deal.IIConfig.cmake</code> is also
-  available as a Makefile includable file called
-  <code>Make.global_options</code>. It resides under
-  <code>share/deal.II/Make.global_options</code> in the build and install
-  directory (or alternatively whichever relative path
-  <code>DEAL_II_SHARE_RELDIR</code> is set to).
-</p>
-
-    <hr />
-    <div class="right">
-      <a href="http://validator.w3.org/check?uri=referer" target="_top">
-        <img style="border:0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
-      <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top">
-        <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"></a>
-    </div>
+<hr />
+<div class="right">
+  <a href="http://validator.w3.org/check?uri=referer" target="_top">
+    <img style="border:0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
+  <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top">
+    <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"></a>
+</div>
 
-  </body>
+</body>
 </html>