From: bangerth Date: Thu, 9 Jun 2011 22:19:05 +0000 (+0000) Subject: Work around a problem in make 3.82: We define a rule in Makefile.rules how to generat... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c89977ba483cff815386b79f7a05d5c4eba57f3b;p=dealii-svn.git Work around a problem in make 3.82: We define a rule in Makefile.rules how to generate the %/output files, but we define a different rule in mpi/Makefile for the same pattern. This appears to have worked with gmake 3.81, but doesn't any longer with 3.82. Fix this by disabling the first definition if Makefile.rules is included from mpi/Makefile. git-svn-id: https://svn.dealii.org/trunk@23798 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile.rules b/tests/Makefile.rules index 5dea356cb2..e03d9fdc26 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -80,6 +80,7 @@ endif # date and does not need to be regenerated ############################################################ +ifndef OVERRIDE_OUTPUT_RULE %/output : %/exe @echo =====Running======= $< @echo Running > $(dir $@)/status @@ -88,7 +89,7 @@ endif ./$< ; \ if test ! $$? = 0 ; then rm $@ ; false ; fi @perl -pi $(normalize) $@ - +endif ############################################################ diff --git a/tests/mpi/Makefile b/tests/mpi/Makefile index 5858a8c814..b1be076ca3 100644 --- a/tests/mpi/Makefile +++ b/tests/mpi/Makefile @@ -1,6 +1,6 @@ ############################################################ # $Id: Makefile 17098 2008-10-03 19:27:13Z bangerth $ -# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors +# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 by the deal.II authors ############################################################ ############################################################ @@ -33,6 +33,7 @@ tests = $(shell echo $(addsuffix /ncpu_*, $(basename $(tests_x_1)))) ############################################################ +OVERRIDE_OUTPUT_RULE = yes include ../Makefile.rules include Makefile.depend