From 9029f8b9791900b509146cb4daa847412a0905c3 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sun, 6 May 2007 17:15:53 +0000 Subject: [PATCH] Fixed the Make clean rule. Have to eliminate .depends before make is called, because the rule to 'make .depends' was being called on invocation if .depends exists. --- .../ChemEquil_gri_matrix/Makefile.in | 1 - test_problems/Makefile.in | 42 ++++++++--------- test_problems/cathermo/Makefile.in | 46 ++++++++++--------- 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/test_problems/ChemEquil_gri_matrix/Makefile.in b/test_problems/ChemEquil_gri_matrix/Makefile.in index 6cc879cbd..66584b622 100644 --- a/test_problems/ChemEquil_gri_matrix/Makefile.in +++ b/test_problems/ChemEquil_gri_matrix/Makefile.in @@ -116,4 +116,3 @@ ifeq ($(wildcard .depends), .depends) include .depends endif - diff --git a/test_problems/Makefile.in b/test_problems/Makefile.in index 84d68a5a6..bddd95c46 100644 --- a/test_problems/Makefile.in +++ b/test_problems/Makefile.in @@ -36,15 +36,15 @@ ifeq ($(test_cathermo),1) endif test: -# @ cd cxx_ex; @MAKE@ -s test - @ cd surfkin; @MAKE@ -s test - @ cd fracCoeff; @MAKE@ -s test - @ cd negATest; @MAKE@ -s test - @ cd diamondSurf; @MAKE@ -s test +# @ cd cxx_ex; @MAKE@ -s test + @ cd surfkin; @MAKE@ -s test + @ cd fracCoeff; @MAKE@ -s test + @ cd negATest; @MAKE@ -s test + @ cd diamondSurf; @MAKE@ -s test @ cd ChemEquil_gri_matrix; @MAKE@ -s test - @ cd ChemEquil_gri_pairs; @MAKE@ -s test + @ cd ChemEquil_gri_pairs; @MAKE@ -s test @ cd ChemEquil_ionizedGas; @MAKE@ -s test - @ cd ChemEquil_red1; @MAKE@ -s test + @ cd ChemEquil_red1; @MAKE@ -s test ifeq ($(test_cathermo),1) @ cd pureFluidTest; @MAKE@ -s test endif @@ -64,20 +64,20 @@ endif clean: $(RM) *.*~ -# cd cxx_ex; @MAKE@ clean - cd surfkin; @MAKE@ clean - cd fracCoeff; @MAKE@ clean - cd negATest; @MAKE@ clean - cd diamondSurf; @MAKE@ clean - cd ChemEquil_gri_matrix; @MAKE@ clean - cd ChemEquil_gri_pairs; @MAKE@ clean - cd ChemEquil_ionizedGas; @MAKE@ clean - cd ChemEquil_red1; @MAKE@ clean - cd pureFluidTest; @MAKE@ clean - cd ck2cti_test; @MAKE@ clean - cd min_python; @MAKE@ clean - cd python; @MAKE@ clean - cd cathermo; @MAKE@ clean +# cd cxx_ex; $(RM) .depends ; @MAKE@ clean + cd surfkin; $(RM) .depends ; @MAKE@ clean + cd fracCoeff; $(RM) .depends ; @MAKE@ clean + cd negATest; $(RM) .depends ; @MAKE@ clean + cd diamondSurf; $(RM) .depends ; @MAKE@ clean + cd ChemEquil_gri_matrix; $(RM) .depends ; @MAKE@ clean + cd ChemEquil_gri_pairs; $(RM) .depends ; @MAKE@ clean + cd ChemEquil_ionizedGas; $(RM) .depends ; @MAKE@ clean + cd ChemEquil_red1; $(RM) .depends ; @MAKE@ clean + cd pureFluidTest; $(RM) .depends ; @MAKE@ clean + cd ck2cti_test; $(RM) .depends ; @MAKE@ clean + cd min_python; @MAKE@ clean + cd python; @MAKE@ clean + cd cathermo; @MAKE@ clean depends: # cd cxx_ex; @MAKE@ depends diff --git a/test_problems/cathermo/Makefile.in b/test_problems/cathermo/Makefile.in index 0209d51a3..4ed5dd447 100644 --- a/test_problems/cathermo/Makefile.in +++ b/test_problems/cathermo/Makefile.in @@ -58,29 +58,33 @@ ifeq ($(test_electrolytes),1) cd DH_graph_NM; @MAKE@ -s test cd DH_graph_Pitzer; @MAKE@ -s test endif - +# +# Have to remove .depends before calling make, because +# the rule for updating .depends is invoked, before the clean rule, +# if .depends exists in the directory. +# clean: $(RM) *.*~ - cd issp; @MAKE@ clean - cd stoichSubSSTP; @MAKE@ clean - cd ims; @MAKE@ clean - cd testIAPWS; @MAKE@ clean - cd testIAPWSPres; @MAKE@ clean - cd testIAPWSTripP; @MAKE@ clean - cd testWaterPDSS; @MAKE@ clean - cd testWaterTP; @MAKE@ clean - cd HMW_graph_GvT; @MAKE@ clean - cd HMW_graph_GvI; @MAKE@ clean - cd HMW_graph_HvT; @MAKE@ clean - cd HMW_graph_CpvT; @MAKE@ clean - cd HMW_graph_VvT; @MAKE@ clean - cd HMW_test_1; @MAKE@ clean - cd HMW_test_3; @MAKE@ clean - cd DH_graph_1; @MAKE@ clean - cd DH_graph_acommon; @MAKE@ clean - cd DH_graph_bdotak; @MAKE@ clean - cd DH_graph_NM; @MAKE@ clean - cd DH_graph_Pitzer; @MAKE@ clean + cd issp; $(RM) .depends ; @MAKE@ clean + cd stoichSubSSTP; $(RM) .depends ; @MAKE@ clean + cd ims; $(RM) .depends ; @MAKE@ clean + cd testIAPWS; $(RM) .depends ; @MAKE@ clean + cd testIAPWSPres; $(RM) .depends ; @MAKE@ clean + cd testIAPWSTripP; $(RM) .depends ; @MAKE@ clean + cd testWaterPDSS; $(RM) .depends ; @MAKE@ clean + cd testWaterTP; $(RM) .depends ; @MAKE@ clean + cd HMW_graph_GvT; $(RM) .depends ; @MAKE@ clean + cd HMW_graph_GvI; $(RM) .depends ; @MAKE@ clean + cd HMW_graph_HvT; $(RM) .depends ; @MAKE@ clean + cd HMW_graph_CpvT; $(RM) .depends ; @MAKE@ clean + cd HMW_graph_VvT; $(RM) .depends ; @MAKE@ clean + cd HMW_test_1; $(RM) .depends ; @MAKE@ clean + cd HMW_test_3; $(RM) .depends ; @MAKE@ clean + cd DH_graph_1; $(RM) .depends ; @MAKE@ clean + cd DH_graph_acommon; $(RM) .depends ; @MAKE@ clean + cd DH_graph_bdotak; $(RM) .depends ; @MAKE@ clean + cd DH_graph_NM; $(RM) .depends ; @MAKE@ clean + cd DH_graph_Pitzer; $(RM) .depends ; @MAKE@ clean depends: ifeq ($(test_issp),1)