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

Diff for /JSOC/make_basic.mk between version 1.62 and 1.67

version 1.62, 2009/10/14 17:07:41 version 1.67, 2010/10/22 01:08:30
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
   #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #
Line 142  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)\""
 # #
 #***********************************************************************************************# #***********************************************************************************************#
  
Line 188  endif
Line 183  endif
 # #
 LL_ALL          = $(SYSLIBS) LL_ALL          = $(SYSLIBS)
 GCC_LF_ALL      = $(STATIC) GCC_LF_ALL      = $(STATIC)
 ICC_LF_ALL      = $(STATIC) -openmp -static-intel  ICC_LF_ALL      = $(STATIC) -openmp -static-intel -Wl,-export-dynamic
  
 # Fortran global LINK flags # Fortran global LINK flags
 F_LF_ALL        = -nofor_main  -openmp -static-intel F_LF_ALL        = -nofor_main  -openmp -static-intel
Line 307  ifneq ($(COMPILER), icc)
Line 302  ifneq ($(COMPILER), icc)
 else else
   SYSLIBS = -lz -ldl -lpthread   SYSLIBS = -lz -ldl -lpthread
 endif endif
 SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC) $(LIBDSTRUCT)  SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBEXPDRMS) $(LIBEXPUTL) $(LIBMISC) $(LIBDSTRUCT)
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC) $(LIBDSTRUCT)  FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBEXPDRMS) $(LIBEXPUTL) $(LIBMISC) $(LIBDSTRUCT)
  
 ########## Libraries to link for server executables,    ############## ########## Libraries to link for server executables,    ##############
 ########## standalone executables and pipeline modules. ############## ########## standalone executables and pipeline modules. ##############


Legend:
Removed from v.1.62  
changed lines
  Added in v.1.67

Karen Tian
Powered by
ViewCVS 0.9.4