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

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

version 1.47, 2009/07/24 14:13:48 version 1.49, 2009/07/27 23:50:08
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  _JSOCROOT_ = ..
 -include $(SRCDIR)/custom.mk  
  
 PGIPATH = /usr/include/pgsql PGIPATH = /usr/include/pgsql
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/$(JSOC_MACHINE)/
  
 _JSOCROOT_ = ..  # This optional file has custom definitions created by the configure script
   -include $(SRCDIR)/custom.mk
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #
Line 101  ifeq ($(JSOC_MACHINE), linux_x86_64)
Line 102  ifeq ($(JSOC_MACHINE), linux_x86_64)
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/  #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
 endif endif
 ifeq ($(JSOC_MACHINE), linux_ia32) ifeq ($(JSOC_MACHINE), linux_ia32)
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
Line 109  ifeq ($(JSOC_MACHINE), linux_ia32)
Line 110  ifeq ($(JSOC_MACHINE), linux_ia32)
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/  #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
 endif endif
 ifeq ($(JSOC_MACHINE), mac_osx_ppc) ifeq ($(JSOC_MACHINE), mac_osx_ppc)
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
Line 117  ifeq ($(JSOC_MACHINE), mac_osx_ppc)
Line 118  ifeq ($(JSOC_MACHINE), mac_osx_ppc)
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/  #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
 endif endif
 ifeq ($(JSOC_MACHINE), mac_osx_ia32) ifeq ($(JSOC_MACHINE), mac_osx_ia32)
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
Line 125  ifeq ($(JSOC_MACHINE), mac_osx_ia32)
Line 126  ifeq ($(JSOC_MACHINE), mac_osx_ia32)
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/  #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
 endif endif
  
 # All 3rd-party math libraries - local rules can define a subset  # All 3rd-party libraries - local rules can define a subset
 FMATHLIBS = $(FMATHLIBSL) -lfftw3f FMATHLIBS = $(FMATHLIBSL) -lfftw3f
 CFITSIOLIBS = $(CFITSIOL) -lcfitsio CFITSIOLIBS = $(CFITSIOL) -lcfitsio
   ECPGLIBS = $(ECPGL) -lpq
  
 ifeq ($(COMPILER), gcc) ifeq ($(COMPILER), gcc)
         ifeq ($(JSOC_MACHINE), linux_x86_64)         ifeq ($(JSOC_MACHINE), linux_x86_64)
Line 250  ifeq ($(FCOMPILER), ifort)
Line 252  ifeq ($(FCOMPILER), ifort)
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     FCFLAGS_OPT := -xW     FCFLAGS_OPT := -xW
   endif   endif
   FCLFAGS_INIT := -ftrapuv    FCFLAGS_INIT := -ftrapuv
 else else
   # must be gfortran   # must be gfortran
   FCFLAGS_OPT   := -g    FCFLAGS_OPT   :=
   FCLFAGS_INIT  :=    FCFLAGS_INIT  :=
 endif endif
  
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
 # -xW optimizes ifort compilation for Pentium 4 # -xW optimizes ifort compilation for Pentium 4
 # -ftrapuv initializes stack local variables to an unusual value to aid error detection. # -ftrapuv initializes stack local variables to an unusual value to aid error detection.
   F_CF_ALL      := $(F_CF_ALL) $(FCFLAGS_OPT) $(FCLFAGS_INIT) $(FCOMPILER_WARN)    F_CF_ALL      := $(F_CF_ALL) $(FCFLAGS_OPT) $(FCOMPILER_WARN)
 else else
   F_CF_ALL      := $(F_CF_ALL) $(FCLFAGS_INIT) $(FCOMPILER_WARN)    F_CF_ALL      := $(F_CF_ALL) -g $(FCFLAGS_INIT) $(FCOMPILER_WARN)
 endif endif
 #***********************************************************************************************# #***********************************************************************************************#
  
Line 370  $(FEXE): %: %.o $(FMATHLIBS)
Line 372  $(FEXE): %: %.o $(FMATHLIBS)
                 $(FLINK)                 $(FLINK)
                 $(SLBIN)                 $(SLBIN)
  
 $(SERVEREXE):   LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)  $(SERVEREXE):   LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS)
 $(SERVEREXE):   %:      %.o $(SERVERLIBS) $(SERVEREXE):   %:      %.o $(SERVERLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
  
 $(MODEXE):      LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)  $(MODEXE):      LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS)
 $(MODEXE):      %:      %.o $(MODLIBS) $(MODEXE):      %:      %.o $(MODLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
Line 393  $(FMODEXE_SOCK): %_sock: %.o $(FMODL
Line 395  $(FMODEXE_SOCK): %_sock: %.o $(FMODL
                         $(SLBIN)                         $(SLBIN)
  
 # MODEXE_USEF contains all C direct-connect modules that use third-party Fortran libraries. # MODEXE_USEF contains all C direct-connect modules that use third-party Fortran libraries.
 $(MODEXE_USEF): LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS) $(FMATHLIBS)  $(MODEXE_USEF): LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS) $(FMATHLIBS)
 $(MODEXE_USEF):     %:  %.o $(MODLIBS) $(MODEXE_USEF):     %:  %.o $(MODLIBS)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)

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