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

Diff for /JSOC/make_basic.mk between version 1.63 and 1.65

version 1.63, 2009/10/15 20:10:24 version 1.65, 2010/08/29 04:43:24
Line 7  DBNAME = POSTGRESQL
Line 7  DBNAME = POSTGRESQL
 # categories (like dbserver). # categories (like dbserver).
 MACHTYPE = $(shell $(SRCDIR)/getmachtype.pl) MACHTYPE = $(shell $(SRCDIR)/getmachtype.pl)
  
 # This optional file has custom definitions created by the configure script  
 -include $(SRCDIR)/custom.mk  
   
 # If MACH was set when the make command was issued (eg., make MACH='N02'), then # If MACH was set when the make command was issued (eg., make MACH='N02'), then
 # use its value for the output/obj directory and use the custom.mk variables # use its value for the output/obj directory and use the custom.mk variables
 # relevant to its value. Otherwise, use $(JSOC_MACHINE). # relevant to its value. Otherwise, use $(JSOC_MACHINE).
Line 24  endif
Line 21  endif
 COMPILER = icc COMPILER = icc
 FCOMPILER = ifort FCOMPILER = ifort
  
 ifneq ($(JSOC_AUTOCOMPILER),)  
 COMPILER = $(JSOC_AUTOCOMPILER)  
 endif  
   
 ifneq ($(JSOC_AUTOFCOMPILER),)  
 FCOMPILER = $(JSOC_AUTOFCOMPILER)  
 endif  
   
 # can set through custom.mk or through environment # can set through custom.mk or through environment
 ifneq ($(JSOC_COMPILER),) ifneq ($(JSOC_COMPILER),)
 COMPILER = $(JSOC_COMPILER) COMPILER = $(JSOC_COMPILER)
Line 42  FCOMPILER = $(JSOC_FCOMPILER)
Line 31  FCOMPILER = $(JSOC_FCOMPILER)
 endif endif
 #***********************************************************************************************# #***********************************************************************************************#
  
   #***********************************************************************************************#
   # This optional file has custom definitions created by the configure script.
   # Do this after compiler selection since custom.mk might use $COMPILER or $FCOMPILER.
   # custom.mk might also set compiler (through moreconfigure.pl)
   -include $(LOCALIZATIONDIR)/custom.mk
   #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #


Legend:
Removed from v.1.63  
changed lines
  Added in v.1.65

Karen Tian
Powered by
ViewCVS 0.9.4