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

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

version 1.65, 2010/08/29 04:43:24 version 1.77, 2012/06/11 15:01:20
Line 1 
Line 1 
 VPATH  = $(SRCDIR) VPATH  = $(SRCDIR)
 STATIC = STATIC =
 DBNAME = POSTGRESQL  DBMS = POSTGRESQL
  
 # Run a script to determine the machine on which make is being run. This # Run a script to determine the machine on which make is being run. This
 # MAY return a machine type, if the host found falls into one of several # MAY return a machine type, if the host found falls into one of several
Line 35  endif
Line 35  endif
 # This optional file has custom definitions created by the configure script. # This optional file has custom definitions created by the configure script.
 # Do this after compiler selection since custom.mk might use $COMPILER or $FCOMPILER. # Do this after compiler selection since custom.mk might use $COMPILER or $FCOMPILER.
 # custom.mk might also set compiler (through moreconfigure.pl) # custom.mk might also set compiler (through moreconfigure.pl)
 -include $(LOCALIZATIONDIR)/custom.mk  -include $(SRCDIR)/$(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="\"$(WORKINGDIR)/lib/$(MACH)\""  GLOBALSW = -DDRMS_ARCH="\"$(MACH)\""
 # #
 #***********************************************************************************************# #***********************************************************************************************#
  
Line 183  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  ifeq ($(FCOMPILER), ifort)
   F_LF_ALL        = -nofor-main  -openmp -static-intel -Wl,-export-dynamic
   endif
 #***********************************************************************************************# #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
Line 198  ICC_CF_ICCCOMP = -DICCCOMP -openmp
Line 200  ICC_CF_ICCCOMP = -DICCCOMP -openmp
  
 # can't figure out how to get stupid make to do if/else if/else # can't figure out how to get stupid make to do if/else if/else
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
   GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)    GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
 # -xW tells the icc compiler to optimize for Pentium 4 # -xW tells the icc compiler to optimize for Pentium 4
   ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)    ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
  
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia64)   ifeq ($(JSOC_MACHINE), linux_ia64)
     ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)      ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia32)   ifeq ($(JSOC_MACHINE), linux_ia32)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
   endif   endif
  
 else else
Line 302  ifneq ($(COMPILER), icc)
Line 304  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) $(LIBSTATS)
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC) $(LIBDSTRUCT)  FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBEXPDRMS) $(LIBEXPUTL) $(LIBMISC) $(LIBDSTRUCT) $(LIBSTATS)
  
 ########## Libraries to link for server executables,    ############## ########## Libraries to link for server executables,    ##############
 ########## standalone executables and pipeline modules. ############## ########## standalone executables and pipeline modules. ##############
Line 331  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
Line 333  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
 # PROJECT MAKE RULES # PROJECT MAKE RULES
 # #
 # Make rules that apply to all projects outside of the base DRMS/SUMS system # Make rules that apply to all projects outside of the base DRMS/SUMS system
 -include $(SRCDIR)/proj/make_basic.mk  -include $(SRCDIR)/$(LOCALIZATIONDIR)/make_basic.mk
 #***********************************************************************************************# #***********************************************************************************************#
  
  
Line 358  $(MODEXE): %: %.o $(MODLIBS)
Line 360  $(MODEXE): %: %.o $(MODLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
  
 $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CFITSIOLIBS)  $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
 # FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file. # FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file.
 # These are socket-connect modules only. Assume they use third-party Fortran libraries # These are socket-connect modules only. Assume they use third-party Fortran libraries
 # (although this may not be the case). # (although this may not be the case).
 $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CFITSIOLIBS)  $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK) $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
Line 376  $(MODEXE_USEF): %: %.o $(MODLIBS)
Line 378  $(MODEXE_USEF): %: %.o $(MODLIBS)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
 # MODEXE_USEF contains all C socket-connect modules that use third-party Fortran libraries. # MODEXE_USEF contains all C socket-connect modules that use third-party Fortran libraries.
 $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS)  $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)

Legend:
Removed from v.1.65  
changed lines
  Added in v.1.77
Karen Tian
 Powered by
ViewCVS 0.9.4