(file) Return to make_basic.mk CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.46 and 1.47

version 1.46, 2009/06/05 21:03:51 version 1.47, 2009/07/24 14:13:48
Line 16  _JSOCROOT_ = ..
Line 16  _JSOCROOT_ = ..
 COMPILER = icc COMPILER = icc
 FCOMPILER = ifort FCOMPILER = ifort
  
 ifneq ($(AUTOCOMPILER),)  ifneq ($(JSOC_AUTOCOMPILER),)
 COMPILER = $(AUTOCOMPILER)  COMPILER = $(JSOC_AUTOCOMPILER)
 endif endif
  
 ifneq ($(AUTOFCOMPILER),)  ifneq ($(JSOC_AUTOFCOMPILER),)
 FCOMPILER = $(AUTOFCOMPILER)  FCOMPILER = $(JSOC_AUTOFCOMPILER)
 endif endif
  
 # can set through custom.mk or through environment # can set through custom.mk or through environment
 ifneq ($(CUSTOM_COMPILER),)  ifneq ($(JSOC_COMPILER),)
 COMPILER = $(CUSTOM_COMPILER)  COMPILER = $(JSOC_COMPILER)
 endif endif
  
 ifneq ($(CUSTOM_FCOMPILER),)  ifneq ($(JSOC_FCOMPILER),)
 FCOMPILER = $(CUSTOM_FCOMPILER)  FCOMPILER = $(JSOC_FCOMPILER)
 endif endif
 #***********************************************************************************************# #***********************************************************************************************#
  


Legend:
Removed from v.1.46  
changed lines
  Added in v.1.47

Karen Tian
Powered by
ViewCVS 0.9.4