From: wolf Date: Mon, 11 Nov 2002 17:38:32 +0000 (+0000) Subject: Use local systems default suffix for object files. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc75d03957bae605840315e252a977cfbb350561;p=dealii-svn.git Use local systems default suffix for object files. git-svn-id: https://svn.dealii.org/trunk@6751 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile.rules b/tests/Makefile.rules index cf9f4e4eb6..bbd86ea78e 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -24,11 +24,11 @@ ifeq ($(findstring gcc,$(GXX_VERSION)),gcc) flags += -Wno-missing-noreturn endif -%.go : %.cc Makefile +%.g.$(OBJEXT) : %.cc Makefile @echo =====debug========= $< @$(CXX) $(flags) -c $< -o $@ -%.o : %.cc Makefile +%.$(OBJEXT) : %.cc Makefile @echo =====optimized===== $< @$(CXX) $(CXXFLAGS.o) -c $< -o $@ %.exe : @@ -128,7 +128,7 @@ run-tests: $(tests:%=%.OK) ############################################################ clean: - -rm -f Makefile.depend *.o *.go *.output *~ + -rm -f Makefile.depend *.$(OBJEXT) *.g.$(OBJEXT) *.output *~ veryclean: clean -rm -f *.exe *.testcase *.inp *.gpl *.eps *.gnuplot @@ -144,7 +144,7 @@ show-tests: Makefile.depend: $(shell echo *.cc) @echo =====Dependencies== $@ @$(CXX) $(CXXFLAGS.g) $^ -M > $@ - @perl -pi -e 's/(^[^.]+)\.o:/\1.o \1.go:/;' $@ + @perl -pi -e 's/(^[^.]+)\.$(OBJEXT):/\1.$(OBJEXT) \1.g.$(OBJEXT):/;' $@ .PHONY: report show-tests diff --git a/tests/base/Makefile b/tests/base/Makefile index f5c0c96cd5..191a513672 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -20,15 +20,15 @@ default: run-tests ############################################################ -logtest.exe : logtest.go $(lib-base.g) -polynomial_test.exe: polynomial_test.go abort.go $(lib-base.g) -polynomial1d.exe : polynomial1d.go $(lib-base.g) -quadrature_test.exe: quadrature_test.go $(libraries) -reference.exe : reference.go abort.go $(libraries) -table.exe : table.go $(libraries) -tensor.exe : tensor.go $(libraries) -timer.exe : timer.go $(libraries) -auto_derivative_function.exe : auto_derivative_function.go $(libraries) +logtest.exe : logtest.g.$(OBJEXT) $(lib-base.g) +polynomial_test.exe: polynomial_test.g.$(OBJEXT) abort.g.$(OBJEXT) $(lib-base.g) +polynomial1d.exe : polynomial1d.g.$(OBJEXT) $(lib-base.g) +quadrature_test.exe: quadrature_test.g.$(OBJEXT) $(libraries) +reference.exe : reference.g.$(OBJEXT) abort.g.$(OBJEXT) $(libraries) +table.exe : table.g.$(OBJEXT) $(libraries) +tensor.exe : tensor.g.$(OBJEXT) $(libraries) +timer.exe : timer.g.$(OBJEXT) $(libraries) +auto_derivative_function.exe : auto_derivative_function.g.$(OBJEXT) $(libraries) tests = $(sort \ diff --git a/tests/bits/Makefile b/tests/bits/Makefile index 3f42de46ed..ff2ea93248 100644 --- a/tests/bits/Makefile +++ b/tests/bits/Makefile @@ -22,12 +22,12 @@ default: run-tests ############################################################ -anna_1.exe : anna_1.go $(libraries) -anna_2.exe : anna_2.go $(libraries) -anna_3.exe : anna_3.go $(libraries) -anna_5.exe : anna_5.go $(libraries) -gerold_1.exe : gerold_1.go $(libraries) -roy_1.exe : roy_1.go $(libraries) +anna_1.exe : anna_1.g.$(OBJEXT) $(libraries) +anna_2.exe : anna_2.g.$(OBJEXT) $(libraries) +anna_3.exe : anna_3.g.$(OBJEXT) $(libraries) +anna_5.exe : anna_5.g.$(OBJEXT) $(libraries) +gerold_1.exe : gerold_1.g.$(OBJEXT) $(libraries) +roy_1.exe : roy_1.g.$(OBJEXT) $(libraries) tests = anna_1 anna_2 anna_3 anna_5 \ gerold_1 \ diff --git a/tests/deal.II/Makefile b/tests/deal.II/Makefile index 4020497c06..9c603e7a6c 100644 --- a/tests/deal.II/Makefile +++ b/tests/deal.II/Makefile @@ -22,33 +22,33 @@ default: run-tests ############################################################ -block_matrices.exe : block_matrices.go $(lib-2d) $(libraries) -constraints.exe : constraints.go $(lib-2d) $(lib-3d) $(libraries) -data_out.exe : data_out.go $(lib-2d) $(lib-3d) $(libraries) -derivative_approximation.exe : derivative_approximation.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -derivatives.exe : derivatives.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -dof_test.exe : dof_test.go $(lib-2d) $(lib-3d) $(libraries) -dof_renumbering.exe : dof_renumbering.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -error_estimator.exe : error_estimator.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -gradients.exe : gradients.go $(lib-2d) $(libraries) -grid_out.exe : grid_out.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -grid_test.exe : grid_test.go $(lib-2d) $(lib-3d) $(libraries) -grid_transform.exe : grid_transform.go $(lib-2d) $(lib-3d) $(libraries) -intergrid_constraints.exe : intergrid_constraints.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -intergrid_map.exe : intergrid_map.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -matrices.exe : matrices.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -mg.exe : mg.go $(lib-2d) $(libraries) -mglocal.exe : mglocal.go $(lib-2d) $(libraries) -second_derivatives.exe : second_derivatives.go $(lib-2d) $(libraries) -wave-test-3.exe : wave-test-3.go $(lib-2d) $(libraries) -support_point_map.exe : support_point_map.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -filtered_matrix.exe : filtered_matrix.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -boundaries.exe : boundaries.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -sparsity_pattern.exe : sparsity_pattern.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -grid_tools.exe : grid_tools.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -subdomain_ids.exe : subdomain_ids.go $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) -filtered_iterator.exe : filtered_iterator.go $(lib-2d) $(libraries) -grid_in.exe : grid_in.go $(lib-2d) $(libraries) +block_matrices.exe : block_matrices.g.$(OBJEXT) $(lib-2d) $(libraries) +constraints.exe : constraints.g.$(OBJEXT) $(lib-2d) $(lib-3d) $(libraries) +data_out.exe : data_out.g.$(OBJEXT) $(lib-2d) $(lib-3d) $(libraries) +derivative_approximation.exe : derivative_approximation.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +derivatives.exe : derivatives.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +dof_test.exe : dof_test.g.$(OBJEXT) $(lib-2d) $(lib-3d) $(libraries) +dof_renumbering.exe : dof_renumbering.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +error_estimator.exe : error_estimator.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +gradients.exe : gradients.g.$(OBJEXT) $(lib-2d) $(libraries) +grid_out.exe : grid_out.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +grid_test.exe : grid_test.g.$(OBJEXT) $(lib-2d) $(lib-3d) $(libraries) +grid_transform.exe : grid_transform.g.$(OBJEXT) $(lib-2d) $(lib-3d) $(libraries) +intergrid_constraints.exe : intergrid_constraints.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +intergrid_map.exe : intergrid_map.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +matrices.exe : matrices.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +mg.exe : mg.g.$(OBJEXT) $(lib-2d) $(libraries) +mglocal.exe : mglocal.g.$(OBJEXT) $(lib-2d) $(libraries) +second_derivatives.exe : second_derivatives.g.$(OBJEXT) $(lib-2d) $(libraries) +wave-test-3.exe : wave-test-3.g.$(OBJEXT) $(lib-2d) $(libraries) +support_point_map.exe : support_point_map.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +filtered_matrix.exe : filtered_matrix.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +boundaries.exe : boundaries.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +sparsity_pattern.exe : sparsity_pattern.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +grid_tools.exe : grid_tools.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +subdomain_ids.exe : subdomain_ids.g.$(OBJEXT) $(lib-1d) $(lib-2d) $(lib-3d) $(libraries) +filtered_iterator.exe : filtered_iterator.g.$(OBJEXT) $(lib-2d) $(libraries) +grid_in.exe : grid_in.g.$(OBJEXT) $(lib-2d) $(libraries) tests = $(sort \ diff --git a/tests/fe/Makefile b/tests/fe/Makefile index 17d4e4d1aa..1940209463 100644 --- a/tests/fe/Makefile +++ b/tests/fe/Makefile @@ -22,23 +22,23 @@ default: run-tests ############################################################ -derivatives.exe : derivatives.go $(libraries) -fe_data_test.exe : fe_data_test.go $(libraries) -fe_tools_test.exe : fe_tools_test.go $(libraries) -fe_traits.exe : fe_traits.go $(libraries) -internals.exe : internals.go $(libraries) -mapping.exe : mapping.go $(libraries) -mapping_c1.exe : mapping_c1.go $(libraries) -mapping_q1_eulerian.exe : mapping_q1_eulerian.go $(libraries) -nedelec.exe : nedelec.go $(libraries) -nedelec_2.exe : nedelec_2.go $(libraries) -nedelec_3.exe : nedelec_3.go $(libraries) -non_primitive_1.exe : non_primitive_1.go $(libraries) -non_primitive_2.exe : non_primitive_2.go $(libraries) -numbering.exe : numbering.go $(libraries) -shapes.exe : shapes.go $(libraries) -transfer.exe : transfer.go $(libraries) -up_and_down.exe : up_and_down.go $(libraries) +derivatives.exe : derivatives.g.$(OBJEXT) $(libraries) +fe_data_test.exe : fe_data_test.g.$(OBJEXT) $(libraries) +fe_tools_test.exe : fe_tools_test.g.$(OBJEXT) $(libraries) +fe_traits.exe : fe_traits.g.$(OBJEXT) $(libraries) +internals.exe : internals.g.$(OBJEXT) $(libraries) +mapping.exe : mapping.g.$(OBJEXT) $(libraries) +mapping_c1.exe : mapping_c1.g.$(OBJEXT) $(libraries) +mapping_q1_eulerian.exe : mapping_q1_eulerian.g.$(OBJEXT) $(libraries) +nedelec.exe : nedelec.g.$(OBJEXT) $(libraries) +nedelec_2.exe : nedelec_2.g.$(OBJEXT) $(libraries) +nedelec_3.exe : nedelec_3.g.$(OBJEXT) $(libraries) +non_primitive_1.exe : non_primitive_1.g.$(OBJEXT) $(libraries) +non_primitive_2.exe : non_primitive_2.g.$(OBJEXT) $(libraries) +numbering.exe : numbering.g.$(OBJEXT) $(libraries) +shapes.exe : shapes.g.$(OBJEXT) $(libraries) +transfer.exe : transfer.g.$(OBJEXT) $(libraries) +up_and_down.exe : up_and_down.g.$(OBJEXT) $(libraries) tests = fe_data_test fe_traits fe_tools_test mapping \ mapping_c1 shapes derivatives numbering mapping_q1_eulerian \ diff --git a/tests/lac/Makefile b/tests/lac/Makefile index cecf28097a..37513cbb69 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -20,19 +20,19 @@ default: run-tests ############################################################ -block_matrices.exe : block_matrices.go $(libraries) -block_vector.exe : block_vector.go abort.go $(libraries) -block_vector_iterator.exe : block_vector_iterator.go $(libraries) -full_matrix.exe : full_matrix.go $(libraries) -matrix_out.exe : matrix_out.go $(libraries) -solver.exe : solver.go testmatrix.go $(libraries) -sparse_matrices.exe : sparse_matrices.go testmatrix.go $(libraries) -sparse_matrices.opt.exe : sparse_matrices.o testmatrix.o $(libraries_o) -sparsity_pattern.exe : sparsity_pattern.go testmatrix.go $(libraries) -sparse_ilu.exe : sparse_ilu.go testmatrix.go $(libraries) -vector-vector.exe : vector-vector.go $(libraries) -#mgbase.exe : mgbase.go $(libraries) -#mg.exe : mg.go testmatrix.go $(libraries) +block_matrices.exe : block_matrices.g.$(OBJEXT) $(libraries) +block_vector.exe : block_vector.g.$(OBJEXT) abort.g.$(OBJEXT) $(libraries) +block_vector_iterator.exe : block_vector_iterator.g.$(OBJEXT) $(libraries) +full_matrix.exe : full_matrix.g.$(OBJEXT) $(libraries) +matrix_out.exe : matrix_out.g.$(OBJEXT) $(libraries) +solver.exe : solver.g.$(OBJEXT) testmatrix.g.$(OBJEXT) $(libraries) +sparse_matrices.exe : sparse_matrices.g.$(OBJEXT) testmatrix.g.$(OBJEXT) $(libraries) +sparse_matrices.opt.exe : sparse_matrices.$(OBJEXT) testmatrix.$(OBJEXT) $(libraries_o) +sparsity_pattern.exe : sparsity_pattern.g.$(OBJEXT) testmatrix.g.$(OBJEXT) $(libraries) +sparse_ilu.exe : sparse_ilu.g.$(OBJEXT) testmatrix.g.$(OBJEXT) $(libraries) +vector-vector.exe : vector-vector.g.$(OBJEXT) $(libraries) +#mgbase.exe : mgbase.g.$(OBJEXT) $(libraries) +#mg.exe : mg.g.$(OBJEXT) testmatrix.g.$(OBJEXT) $(libraries) tests = $(sort \ diff --git a/tests/multigrid/Makefile b/tests/multigrid/Makefile index 39c7ab55af..3f4a3d6853 100644 --- a/tests/multigrid/Makefile +++ b/tests/multigrid/Makefile @@ -1,7 +1,7 @@ # Generated automatically from Makefile.in by configure. ############################################################ # $Id$ -# Copyright (C) 2000, 2001 by the deal.II authors +# Copyright (C) 2000, 2001, 2002 by the deal.II authors ############################################################ ############################################################ @@ -22,7 +22,7 @@ default: run-tests ############################################################ -mg1.exe : mg1.go $(lib-2d) $(libraries) +mg1.exe : mg1.g.$(OBJEXT) $(lib-2d) $(libraries) tests = mg1