From: Matthias Maier Date: Wed, 5 Dec 2012 14:10:09 +0000 (+0000) Subject: Revert "Bugfix: Fix an accidentally commited merge conflict" X-Git-Tag: v8.0.0~1079^2~222 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c15c61a32a6e1a6652ac85b8998bf771d935510;p=dealii.git Revert "Bugfix: Fix an accidentally commited merge conflict" This reverts commit 62e93ea66236eb891a3a08849668a077753d0a56. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27762 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/Makefile b/deal.II/Makefile index adeff1dcb0..74e55a3af5 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -1,660 +1,11 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 +default: -# Default target executed when no arguments are given to make. -default_target: all -.PHONY : default_target +style-h-files:= $(wildcard include/deal.II/*/*.h) +style-cc-files:= $(wildcard source/*/*.cc) +style-examples:= $(wildcard examples/*/*.cc) -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = - -.SUFFIXES: .hpux_make_needs_suffix_list - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - -# A target that is always out of date. -cmake_force: -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/cmake - -# The command to remove a file. -RM = /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The program to use to edit the cache. -CMAKE_EDIT_COMMAND = /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/ccmake - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /tmp/maier/deal.II/deal.II - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /tmp/maier/deal.II/deal.II - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." - /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : edit_cache - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache -.PHONY : edit_cache/fast - -# Special rule for the target install -install: preinstall - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/cmake -P cmake_install.cmake -.PHONY : install - -# Special rule for the target install -install/fast: preinstall/fast - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..." - /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/cmake -P cmake_install.cmake -.PHONY : install/fast - -# Special rule for the target install/local -install/local: preinstall - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..." - /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake -.PHONY : install/local - -# Special rule for the target install/local -install/local/fast: install/local -.PHONY : install/local/fast - -# Special rule for the target install/strip -install/strip: preinstall - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..." - /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake -.PHONY : install/strip - -# Special rule for the target install/strip -install/strip/fast: install/strip -.PHONY : install/strip/fast - -# Special rule for the target list_install_components -list_install_components: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"compat_files\" \"examples\" \"library\"" -.PHONY : list_install_components - -# Special rule for the target list_install_components -list_install_components/fast: list_install_components -.PHONY : list_install_components/fast - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /home/raid2/maier/gentoo-prefix.NOBACKUP/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache -.PHONY : rebuild_cache/fast - -# The main all target -all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /tmp/maier/deal.II/deal.II/CMakeFiles /tmp/maier/deal.II/deal.II/CMakeFiles/progress.marks - $(MAKE) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /tmp/maier/deal.II/deal.II/CMakeFiles 0 -.PHONY : all - -# The main clean target -clean: - $(MAKE) -f CMakeFiles/Makefile2 clean -.PHONY : clean - -# The main clean target -clean/fast: clean -.PHONY : clean/fast - -# Prepare targets for installation. -preinstall: all - $(MAKE) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall - -# Prepare targets for installation. -preinstall/fast: - $(MAKE) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall/fast - -# clear depends -depend: - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -.PHONY : depend - -#============================================================================= -# Target rules for targets named compat_files - -# Build rule for target. -compat_files: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 compat_files -.PHONY : compat_files - -# fast build rule for target. -compat_files/fast: - $(MAKE) -f CMakeFiles/compat_files.dir/build.make CMakeFiles/compat_files.dir/build -.PHONY : compat_files/fast - -#============================================================================= -# Target rules for targets named library - -# Build rule for target. -library: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 library -.PHONY : library - -# fast build rule for target. -library/fast: - $(MAKE) -f CMakeFiles/library.dir/build.make CMakeFiles/library.dir/build -.PHONY : library/fast - -#============================================================================= -# Target rules for targets named expand_instantiations - -# Build rule for target. -expand_instantiations: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 expand_instantiations -.PHONY : expand_instantiations - -# fast build rule for target. -expand_instantiations/fast: - $(MAKE) -f cmake/scripts/CMakeFiles/expand_instantiations.dir/build.make cmake/scripts/CMakeFiles/expand_instantiations.dir/build -.PHONY : expand_instantiations/fast - -#============================================================================= -# Target rules for targets named make_dependencies - -# Build rule for target. -make_dependencies: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 make_dependencies -.PHONY : make_dependencies - -# fast build rule for target. -make_dependencies/fast: - $(MAKE) -f cmake/scripts/CMakeFiles/make_dependencies.dir/build.make cmake/scripts/CMakeFiles/make_dependencies.dir/build -.PHONY : make_dependencies/fast - -#============================================================================= -# Target rules for targets named report_features - -# Build rule for target. -report_features: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 report_features -.PHONY : report_features - -# fast build rule for target. -report_features/fast: - $(MAKE) -f cmake/scripts/CMakeFiles/report_features.dir/build.make cmake/scripts/CMakeFiles/report_features.dir/build -.PHONY : report_features/fast - -#============================================================================= -# Target rules for targets named obj_functionparser.debug - -# Build rule for target. -obj_functionparser.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_functionparser.debug -.PHONY : obj_functionparser.debug - -# fast build rule for target. -obj_functionparser.debug/fast: - $(MAKE) -f bundled/functionparser/CMakeFiles/obj_functionparser.debug.dir/build.make bundled/functionparser/CMakeFiles/obj_functionparser.debug.dir/build -.PHONY : obj_functionparser.debug/fast - -#============================================================================= -# Target rules for targets named obj_functionparser.release - -# Build rule for target. -obj_functionparser.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_functionparser.release -.PHONY : obj_functionparser.release - -# fast build rule for target. -obj_functionparser.release/fast: - $(MAKE) -f bundled/functionparser/CMakeFiles/obj_functionparser.release.dir/build.make bundled/functionparser/CMakeFiles/obj_functionparser.release.dir/build -.PHONY : obj_functionparser.release/fast - -#============================================================================= -# Target rules for targets named deal_II - -# Build rule for target. -deal_II: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 deal_II -.PHONY : deal_II - -# fast build rule for target. -deal_II/fast: - $(MAKE) -f source/CMakeFiles/deal_II.dir/build.make source/CMakeFiles/deal_II.dir/build -.PHONY : deal_II/fast - -#============================================================================= -# Target rules for targets named deal_II.g - -# Build rule for target. -deal_II.g: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 deal_II.g -.PHONY : deal_II.g - -# fast build rule for target. -deal_II.g/fast: - $(MAKE) -f source/CMakeFiles/deal_II.g.dir/build.make source/CMakeFiles/deal_II.g.dir/build -.PHONY : deal_II.g/fast - -#============================================================================= -# Target rules for targets named obj_base.debug - -# Build rule for target. -obj_base.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_base.debug -.PHONY : obj_base.debug - -# fast build rule for target. -obj_base.debug/fast: - $(MAKE) -f source/base/CMakeFiles/obj_base.debug.dir/build.make source/base/CMakeFiles/obj_base.debug.dir/build -.PHONY : obj_base.debug/fast - -#============================================================================= -# Target rules for targets named obj_base.release - -# Build rule for target. -obj_base.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_base.release -.PHONY : obj_base.release - -# fast build rule for target. -obj_base.release/fast: - $(MAKE) -f source/base/CMakeFiles/obj_base.release.dir/build.make source/base/CMakeFiles/obj_base.release.dir/build -.PHONY : obj_base.release/fast - -#============================================================================= -# Target rules for targets named obj_distributed.debug - -# Build rule for target. -obj_distributed.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_distributed.debug -.PHONY : obj_distributed.debug - -# fast build rule for target. -obj_distributed.debug/fast: - $(MAKE) -f source/distributed/CMakeFiles/obj_distributed.debug.dir/build.make source/distributed/CMakeFiles/obj_distributed.debug.dir/build -.PHONY : obj_distributed.debug/fast - -#============================================================================= -# Target rules for targets named obj_distributed.inst - -# Build rule for target. -obj_distributed.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_distributed.inst -.PHONY : obj_distributed.inst - -# fast build rule for target. -obj_distributed.inst/fast: - $(MAKE) -f source/distributed/CMakeFiles/obj_distributed.inst.dir/build.make source/distributed/CMakeFiles/obj_distributed.inst.dir/build -.PHONY : obj_distributed.inst/fast - -#============================================================================= -# Target rules for targets named obj_distributed.release - -# Build rule for target. -obj_distributed.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_distributed.release -.PHONY : obj_distributed.release - -# fast build rule for target. -obj_distributed.release/fast: - $(MAKE) -f source/distributed/CMakeFiles/obj_distributed.release.dir/build.make source/distributed/CMakeFiles/obj_distributed.release.dir/build -.PHONY : obj_distributed.release/fast - -#============================================================================= -# Target rules for targets named obj_dofs.debug - -# Build rule for target. -obj_dofs.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_dofs.debug -.PHONY : obj_dofs.debug - -# fast build rule for target. -obj_dofs.debug/fast: - $(MAKE) -f source/dofs/CMakeFiles/obj_dofs.debug.dir/build.make source/dofs/CMakeFiles/obj_dofs.debug.dir/build -.PHONY : obj_dofs.debug/fast - -#============================================================================= -# Target rules for targets named obj_dofs.inst - -# Build rule for target. -obj_dofs.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_dofs.inst -.PHONY : obj_dofs.inst - -# fast build rule for target. -obj_dofs.inst/fast: - $(MAKE) -f source/dofs/CMakeFiles/obj_dofs.inst.dir/build.make source/dofs/CMakeFiles/obj_dofs.inst.dir/build -.PHONY : obj_dofs.inst/fast - -#============================================================================= -# Target rules for targets named obj_dofs.release - -# Build rule for target. -obj_dofs.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_dofs.release -.PHONY : obj_dofs.release - -# fast build rule for target. -obj_dofs.release/fast: - $(MAKE) -f source/dofs/CMakeFiles/obj_dofs.release.dir/build.make source/dofs/CMakeFiles/obj_dofs.release.dir/build -.PHONY : obj_dofs.release/fast - -#============================================================================= -# Target rules for targets named obj_fe.debug - -# Build rule for target. -obj_fe.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_fe.debug -.PHONY : obj_fe.debug - -# fast build rule for target. -obj_fe.debug/fast: - $(MAKE) -f source/fe/CMakeFiles/obj_fe.debug.dir/build.make source/fe/CMakeFiles/obj_fe.debug.dir/build -.PHONY : obj_fe.debug/fast - -#============================================================================= -# Target rules for targets named obj_fe.inst - -# Build rule for target. -obj_fe.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_fe.inst -.PHONY : obj_fe.inst - -# fast build rule for target. -obj_fe.inst/fast: - $(MAKE) -f source/fe/CMakeFiles/obj_fe.inst.dir/build.make source/fe/CMakeFiles/obj_fe.inst.dir/build -.PHONY : obj_fe.inst/fast - -#============================================================================= -# Target rules for targets named obj_fe.release - -# Build rule for target. -obj_fe.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_fe.release -.PHONY : obj_fe.release - -# fast build rule for target. -obj_fe.release/fast: - $(MAKE) -f source/fe/CMakeFiles/obj_fe.release.dir/build.make source/fe/CMakeFiles/obj_fe.release.dir/build -.PHONY : obj_fe.release/fast - -#============================================================================= -# Target rules for targets named obj_grid.debug - -# Build rule for target. -obj_grid.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_grid.debug -.PHONY : obj_grid.debug - -# fast build rule for target. -obj_grid.debug/fast: - $(MAKE) -f source/grid/CMakeFiles/obj_grid.debug.dir/build.make source/grid/CMakeFiles/obj_grid.debug.dir/build -.PHONY : obj_grid.debug/fast - -#============================================================================= -# Target rules for targets named obj_grid.inst - -# Build rule for target. -obj_grid.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_grid.inst -.PHONY : obj_grid.inst - -# fast build rule for target. -obj_grid.inst/fast: - $(MAKE) -f source/grid/CMakeFiles/obj_grid.inst.dir/build.make source/grid/CMakeFiles/obj_grid.inst.dir/build -.PHONY : obj_grid.inst/fast - -#============================================================================= -# Target rules for targets named obj_grid.release - -# Build rule for target. -obj_grid.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_grid.release -.PHONY : obj_grid.release - -# fast build rule for target. -obj_grid.release/fast: - $(MAKE) -f source/grid/CMakeFiles/obj_grid.release.dir/build.make source/grid/CMakeFiles/obj_grid.release.dir/build -.PHONY : obj_grid.release/fast - -#============================================================================= -# Target rules for targets named obj_hp.debug - -# Build rule for target. -obj_hp.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_hp.debug -.PHONY : obj_hp.debug - -# fast build rule for target. -obj_hp.debug/fast: - $(MAKE) -f source/hp/CMakeFiles/obj_hp.debug.dir/build.make source/hp/CMakeFiles/obj_hp.debug.dir/build -.PHONY : obj_hp.debug/fast - -#============================================================================= -# Target rules for targets named obj_hp.inst - -# Build rule for target. -obj_hp.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_hp.inst -.PHONY : obj_hp.inst - -# fast build rule for target. -obj_hp.inst/fast: - $(MAKE) -f source/hp/CMakeFiles/obj_hp.inst.dir/build.make source/hp/CMakeFiles/obj_hp.inst.dir/build -.PHONY : obj_hp.inst/fast - -#============================================================================= -# Target rules for targets named obj_hp.release - -# Build rule for target. -obj_hp.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_hp.release -.PHONY : obj_hp.release - -# fast build rule for target. -obj_hp.release/fast: - $(MAKE) -f source/hp/CMakeFiles/obj_hp.release.dir/build.make source/hp/CMakeFiles/obj_hp.release.dir/build -.PHONY : obj_hp.release/fast - -#============================================================================= -# Target rules for targets named obj_lac.debug - -# Build rule for target. -obj_lac.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_lac.debug -.PHONY : obj_lac.debug - -# fast build rule for target. -obj_lac.debug/fast: - $(MAKE) -f source/lac/CMakeFiles/obj_lac.debug.dir/build.make source/lac/CMakeFiles/obj_lac.debug.dir/build -.PHONY : obj_lac.debug/fast - -#============================================================================= -# Target rules for targets named obj_lac.inst - -# Build rule for target. -obj_lac.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_lac.inst -.PHONY : obj_lac.inst - -# fast build rule for target. -obj_lac.inst/fast: - $(MAKE) -f source/lac/CMakeFiles/obj_lac.inst.dir/build.make source/lac/CMakeFiles/obj_lac.inst.dir/build -.PHONY : obj_lac.inst/fast - -#============================================================================= -# Target rules for targets named obj_lac.release - -# Build rule for target. -obj_lac.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_lac.release -.PHONY : obj_lac.release - -# fast build rule for target. -obj_lac.release/fast: - $(MAKE) -f source/lac/CMakeFiles/obj_lac.release.dir/build.make source/lac/CMakeFiles/obj_lac.release.dir/build -.PHONY : obj_lac.release/fast - -#============================================================================= -# Target rules for targets named obj_multigrid.debug - -# Build rule for target. -obj_multigrid.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_multigrid.debug -.PHONY : obj_multigrid.debug - -# fast build rule for target. -obj_multigrid.debug/fast: - $(MAKE) -f source/multigrid/CMakeFiles/obj_multigrid.debug.dir/build.make source/multigrid/CMakeFiles/obj_multigrid.debug.dir/build -.PHONY : obj_multigrid.debug/fast - -#============================================================================= -# Target rules for targets named obj_multigrid.inst - -# Build rule for target. -obj_multigrid.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_multigrid.inst -.PHONY : obj_multigrid.inst - -# fast build rule for target. -obj_multigrid.inst/fast: - $(MAKE) -f source/multigrid/CMakeFiles/obj_multigrid.inst.dir/build.make source/multigrid/CMakeFiles/obj_multigrid.inst.dir/build -.PHONY : obj_multigrid.inst/fast - -#============================================================================= -# Target rules for targets named obj_multigrid.release - -# Build rule for target. -obj_multigrid.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_multigrid.release -.PHONY : obj_multigrid.release - -# fast build rule for target. -obj_multigrid.release/fast: - $(MAKE) -f source/multigrid/CMakeFiles/obj_multigrid.release.dir/build.make source/multigrid/CMakeFiles/obj_multigrid.release.dir/build -.PHONY : obj_multigrid.release/fast - -#============================================================================= -# Target rules for targets named obj_numerics.debug - -# Build rule for target. -obj_numerics.debug: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_numerics.debug -.PHONY : obj_numerics.debug - -# fast build rule for target. -obj_numerics.debug/fast: - $(MAKE) -f source/numerics/CMakeFiles/obj_numerics.debug.dir/build.make source/numerics/CMakeFiles/obj_numerics.debug.dir/build -.PHONY : obj_numerics.debug/fast - -#============================================================================= -# Target rules for targets named obj_numerics.inst - -# Build rule for target. -obj_numerics.inst: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_numerics.inst -.PHONY : obj_numerics.inst - -# fast build rule for target. -obj_numerics.inst/fast: - $(MAKE) -f source/numerics/CMakeFiles/obj_numerics.inst.dir/build.make source/numerics/CMakeFiles/obj_numerics.inst.dir/build -.PHONY : obj_numerics.inst/fast - -#============================================================================= -# Target rules for targets named obj_numerics.release - -# Build rule for target. -obj_numerics.release: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 obj_numerics.release -.PHONY : obj_numerics.release - -# fast build rule for target. -obj_numerics.release/fast: - $(MAKE) -f source/numerics/CMakeFiles/obj_numerics.release.dir/build.make source/numerics/CMakeFiles/obj_numerics.release.dir/build -.PHONY : obj_numerics.release/fast - -# Help Target -help: - @echo "The following are some of the valid targets for this Makefile:" - @echo "... all (the default if no target is provided)" - @echo "... clean" - @echo "... depend" - @echo "... compat_files" - @echo "... edit_cache" - @echo "... install" - @echo "... install/local" - @echo "... install/strip" - @echo "... library" - @echo "... list_install_components" - @echo "... rebuild_cache" - @echo "... expand_instantiations" - @echo "... make_dependencies" - @echo "... report_features" - @echo "... obj_functionparser.debug" - @echo "... obj_functionparser.release" - @echo "... deal_II" - @echo "... deal_II.g" - @echo "... obj_base.debug" - @echo "... obj_base.release" - @echo "... obj_distributed.debug" - @echo "... obj_distributed.inst" - @echo "... obj_distributed.release" - @echo "... obj_dofs.debug" - @echo "... obj_dofs.inst" - @echo "... obj_dofs.release" - @echo "... obj_fe.debug" - @echo "... obj_fe.inst" - @echo "... obj_fe.release" - @echo "... obj_grid.debug" - @echo "... obj_grid.inst" - @echo "... obj_grid.release" - @echo "... obj_hp.debug" - @echo "... obj_hp.inst" - @echo "... obj_hp.release" - @echo "... obj_lac.debug" - @echo "... obj_lac.inst" - @echo "... obj_lac.release" - @echo "... obj_multigrid.debug" - @echo "... obj_multigrid.inst" - @echo "... obj_multigrid.release" - @echo "... obj_numerics.debug" - @echo "... obj_numerics.inst" - @echo "... obj_numerics.release" -.PHONY : help - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system +indent: + @echo "============ Indenting all files" + astyle --options=contrib/utilities/astyle.rc $(style-h-files) $(style-cc-files) $(style-examples) +.PHONY: indent diff --git a/tests/integrators/laplacian_01.cc b/tests/integrators/laplacian_01.cc index 8632894875..08170ff5c5 100644 --- a/tests/integrators/laplacian_01.cc +++ b/tests/integrators/laplacian_01.cc @@ -219,12 +219,21 @@ test(Triangulation& tr) { FE_DGQ q1(1); test_fe(tr, q1); +<<<<<<< HEAD + +// FE_DGQ q2(2); +// test_fe(tr, q2); + + FE_Nedelec n1(1); + test_fe(tr, n1); +======= FE_DGQ q2(2); test_fe(tr, q2); FE_Nedelec n1(1); test_fe(tr, n1); +>>>>>>> trunk } @@ -240,7 +249,14 @@ int main() TestGrids::hypercube(tr2, 1); test(tr2); +<<<<<<< HEAD +// Triangulation<3> tr3; +// TestGrids::hypercube(tr3, 1); +// test(tr3); + +======= Triangulation<3> tr3; TestGrids::hypercube(tr3, 1); test(tr3); +>>>>>>> trunk } diff --git a/tests/lac/constraints_c1.cc b/tests/lac/constraints_c1.cc index 009eba1cc0..7ad414bb6a 100644 --- a/tests/lac/constraints_c1.cc +++ b/tests/lac/constraints_c1.cc @@ -10,7 +10,7 @@ // constraints.close(). // This is because it contains a cycle. The test now checks that this // is detected. -invalid + #include #include diff --git a/tests/lac/constraints_c1_02.cc b/tests/lac/constraints_c1_02.cc index cdba608736..09f25121ec 100644 --- a/tests/lac/constraints_c1_02.cc +++ b/tests/lac/constraints_c1_02.cc @@ -16,8 +16,6 @@ #include #include -invalid - using namespace dealii;