From 2eff1a014b54e2ec3cb37731b715415e4d5ce518 Mon Sep 17 00:00:00 2001 From: kronbichler Date: Thu, 20 Nov 2008 14:36:29 +0000 Subject: [PATCH] Updated some Makefiles. git-svn-id: https://svn.dealii.org/trunk@17659 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-31/Makefile | 12 +----------- deal.II/examples/step-32/Makefile | 12 +----------- deal.II/examples/step-33/Makefile | 11 +++++++++-- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/deal.II/examples/step-31/Makefile b/deal.II/examples/step-31/Makefile index 7c05bcbdb8..33f468fc90 100644 --- a/deal.II/examples/step-31/Makefile +++ b/deal.II/examples/step-31/Makefile @@ -143,21 +143,11 @@ clean: @$(CXX) $(CXXFLAGS.o) -c $< -o $@ -# A rule made to ensure that UMFPACK is indeed configured -ifeq ($(USE_CONTRIB_UMFPACK),yes) -UMFPACK-check: -else -UMFPACK-check: - @echo "This program can only be run if deal.II is configured with UMFPACK support" - @false -endif - - # The following statement tells make that the rules `run' and `clean' # are not expected to produce files of the same name as Makefile rules # usually do. -.PHONY: run clean UMFPACK-check +.PHONY: run clean # Finally there is a rule which you normally need not care much about: diff --git a/deal.II/examples/step-32/Makefile b/deal.II/examples/step-32/Makefile index 7c05bcbdb8..33f468fc90 100644 --- a/deal.II/examples/step-32/Makefile +++ b/deal.II/examples/step-32/Makefile @@ -143,21 +143,11 @@ clean: @$(CXX) $(CXXFLAGS.o) -c $< -o $@ -# A rule made to ensure that UMFPACK is indeed configured -ifeq ($(USE_CONTRIB_UMFPACK),yes) -UMFPACK-check: -else -UMFPACK-check: - @echo "This program can only be run if deal.II is configured with UMFPACK support" - @false -endif - - # The following statement tells make that the rules `run' and `clean' # are not expected to produce files of the same name as Makefile rules # usually do. -.PHONY: run clean UMFPACK-check +.PHONY: run clean # Finally there is a rule which you normally need not care much about: diff --git a/deal.II/examples/step-33/Makefile b/deal.II/examples/step-33/Makefile index 99172c29c6..cc84b86b01 100644 --- a/deal.II/examples/step-33/Makefile +++ b/deal.II/examples/step-33/Makefile @@ -26,7 +26,7 @@ debug-mode = on D = ../../ -# The last field specifies the names of data and other files that +# The fourth field specifies the names of data and other files that # shall be deleted when calling `make clean'. Object and backup files, # executables and the like are removed anyway. Here, we give a list of # files in the various output formats that deal.II supports. @@ -34,6 +34,13 @@ clean-up-files = *gmv *gnuplot *gpl *eps *pov *vtk +# The last field specifies the name of the input file that passes the +# parameters to the program. +run-parameters = input.prm + + + + # # @@ -115,7 +122,7 @@ $(target) : $(libraries) # following rule: run: $(target) @echo ============================ Running $< - @./$(target)$(EXEEXT) + @./$(target)$(EXEEXT) $(run-parameters) # As a last rule to the `make' program, we define what to do when -- 2.39.5