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

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

version 1.61, 2009/10/13 19:22:37 version 1.65, 2010/08/29 04:43:24
Line 2  VPATH = $(SRCDIR)
Line 2  VPATH = $(SRCDIR)
 STATIC = STATIC =
 DBNAME = POSTGRESQL DBNAME = POSTGRESQL
  
 # This optional file has custom definitions created by the configure script  # Run a script to determine the machine on which make is being run. This
 -include $(SRCDIR)/custom.mk  # MAY return a machine type, if the host found falls into one of several
   # categories (like dbserver).
   MACHTYPE = $(shell $(SRCDIR)/getmachtype.pl)
  
 # 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
Line 19  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 37  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
   #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #
Line 137  endif
Line 137  endif
 # All modules must be able to find libdsds.so. The define DRMS_LIBDIR specifies the path to # All modules must be able to find libdsds.so. The define DRMS_LIBDIR specifies the path to
 # all libraries. # all libraries.
  
 GLOBALSW = -DDRMS_LIBDIR="\"$(CURDIR)/../lib/$(MACH)\""  GLOBALSW = -DDRMS_LIBDIR="\"$(WORKINGDIR)/lib/$(MACH)\""
 # #
 #***********************************************************************************************# #***********************************************************************************************#
  


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

Karen Tian
Powered by
ViewCVS 0.9.4