[petsc-dev] make no-print-directory for libfast, but print-directory for gnumake targets
Satish Balay
balay at mcs.anl.gov
Fri Sep 20 14:01:17 CDT 2013
Jed,
How about the following [which keeps the current libfast behavior - and get
the --print-directory for gmake [works with apple's gnumake]
Satish
-------
$ git diff
diff --git a/conf/rules b/conf/rules
index 2938ebb..45d791e 100644
--- a/conf/rules
+++ b/conf/rules
@@ -257,7 +257,7 @@ tree: ${ACTION}
fi; \
(cd $$dir ; \
if [ ${NO_PRINT_DIR}foo = foo ] ; then echo ${ACTION} in: `pwd`; fi; \
- ${OMAKE} tree ACTION=${ACTION} PETSC_ARCH=${PETSC_ARCH} LOC=${LOC} DATAFILESPATH=${DATAFILESPATH} BASE_DIR=${BASE_DIR} NO_PRINT_DIR=${NO_PRINT_DIR});\
+ ${OMAKE_NOPRINTDIR} tree ACTION=${ACTION} PETSC_ARCH=${PETSC_ARCH} LOC=${LOC} DATAFILESPATH=${DATAFILESPATH} BASE_DIR=${BASE_DIR} NO_PRINT_DIR=${NO_PRINT_DIR});\
done
diff --git a/config/BuildSystem/config/packages/make.py b/config/BuildSystem/config/packages/make.py
index 575419c..86c0a3c 100644
--- a/config/BuildSystem/config/packages/make.py
+++ b/config/BuildSystem/config/packages/make.py
@@ -12,7 +12,8 @@ class Configure(config.package.Package):
self.downloadonWindows = 1
self.useddirectly = 0
- self.flags = ''
+ self.printdirflag = ''
+ self.noprintdirflag = ''
self.haveGNUMake = 0
return
@@ -103,7 +104,8 @@ class Configure(config.package.Package):
# Setup make flags
if self.haveGNUMake:
- self.flags += ' --no-print-directory'
+ self.printdirflag = ' --print-directory'
+ self.noprintdirflag = ' --no-print-directory'
self.addMakeMacro('MAKE_IS_GNUMAKE',1)
# Check to see if make allows rules which look inside archives
@@ -158,5 +160,6 @@ class Configure(config.package.Package):
self.executeTest(self.configureMake)
self.executeTest(self.configureCheckGNUMake)
self.executeTest(self.configureMakeNP)
- self.addMakeMacro('OMAKE ', self.make+' '+self.flags)
+ self.addMakeMacro('OMAKE ', self.make+' '+self.printdirflag)
+ self.addMakeMacro('OMAKE_NOPRINTDIR ', self.make+' '+self.noprintdirflag)
return
More information about the petsc-dev
mailing list