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

Diff for /JSOC/make_basic.mk between version 1.54 and 1.56

version 1.54, 2009/09/03 22:36:43 version 1.56, 2009/09/22 17:43:03
Line 4  DBNAME = POSTGRESQL
Line 4  DBNAME = POSTGRESQL
  
 _JSOCROOT_ = .. _JSOCROOT_ = ..
  
 # XXX This PGIPATH var isn't correct - we don't put libpq inside the lib_third_party directory  
 # at Stanford.  
 PGIPATH = /usr/include/pgsql  
 ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/$(JSOC_MACHINE)/  
   
 # This optional file has custom definitions created by the configure script # This optional file has custom definitions created by the configure script
 -include $(SRCDIR)/custom.mk -include $(SRCDIR)/custom.mk
  
Line 96  endif
Line 91  endif
 # contain the paths to the library binaries, and variables # contain the paths to the library binaries, and variables
 # that end in "LIBS" contain the full link cmd (the -L flag plus the -l flag) # that end in "LIBS" contain the full link cmd (the -L flag plus the -l flag)
 # #
 # Path to 3rd-party library headers  
 FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include  
 CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include  
 GSLH = -I$(_JSOCROOT_)/lib_third_party/include  
   
 ifeq ($(JSOC_MACHINE), linux_x86_64)  
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio  
   # Path to 64-bit 3rd-party libraries  
   FMATHLIBSL = -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/  
 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/  
 endif  
 ifeq ($(JSOC_MACHINE), linux_ia32)  
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio  
   # Path to 32-bit 3rd-party libraries  
   FMATHLIBSL = -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/  
 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/  
 endif  
 ifeq ($(JSOC_MACHINE), mac_osx_ppc)  
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio  
   # Path to appropriate 3rd-party libraries  
   FMATHLIBSL = -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/  
 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/  
 endif  
 ifeq ($(JSOC_MACHINE), mac_osx_ia32)  
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio  
   # Path to appropriate 3rd-party libraries  
   FMATHLIBSL = -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/  
 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/  
 endif  
   
 # All 3rd-party libraries - local rules can define a subset  
 FMATHLIBS = $(FMATHLIBSL) -lfftw3f  
 CFITSIOLIBS = $(CFITSIOL) -lcfitsio  
 ECPGLIBS = $(ECPGL) -lpq  
  
 ifeq ($(COMPILER), gcc)  # PostgreSQL
         ifeq ($(JSOC_MACHINE), linux_x86_64)  PGH = -I$(POSTGRES_INCS)
                 ifneq ($(CFITSIOFNAME_GCC_X86_64),)  PGL = -L$(POSTGRES_LIBS)
                         FMATHLIBS = $(FMATHLIBSL) -lfftw3f -l$(CFITSIOFNAME_GCC_X86_64)  PGLIBNAME = $(POSTGRES_LIB)
                         CFITSIOLIBS = $(CFITSIOL) -l$(CFITSIOFNAME_GCC_X86_64)  PGLIBS = $(PGL) -l$(PGLIBNAME)
                 endif  
         endif  # CFITSIO
 endif  CFITSIOH = -I$(CFITSIO_INCS)
   CFITSIOL = -L$(CFITSIO_LIBS)
   CFITSIOLIBNAME = $(CFITSIO_LIB)
   CFITSIOLIBS =  $(CFITSIOL) -l$(CFITSIOLIBNAME)
  
 GSLLIBS = $(GSLL) -lgsl -lgslcblas  
 #***********************************************************************************************# #***********************************************************************************************#
  
  
Line 188  ICC_WARNTOERR = -we266
Line 143  ICC_WARNTOERR = -we266
  
 ifeq ($(WARN), 1) ifeq ($(WARN), 1)
 # Show warnings (always true for a debug build). # Show warnings (always true for a debug build).
 ICC_WARN = -Wall $(ICC_WARNMORE)  ICC_WARN = $(ICC_WARNMORE)
 GCC_WARN = -Wall -Wno-comment  GCC_WARN = -Wno-comment
 FCOMPILER_WARN = FCOMPILER_WARN =
 else else
 # Don't show warnings. # Don't show warnings.
Line 386  $(CEXE): %: %.o $(EXELIBS)
Line 341  $(CEXE): %: %.o $(EXELIBS)
                 $(LINK)                 $(LINK)
                 $(SLBIN)                 $(SLBIN)
  
 $(FEXE):        %:      %.o $(FMATHLIBS)  $(FEXE):        %:      %.o
                 $(FLINK)                 $(FLINK)
                 $(SLBIN)                 $(SLBIN)
  
 $(SERVEREXE):   LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS)  $(SERVEREXE):   LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(SERVEREXE):   %:      %.o $(SERVERLIBS) $(SERVEREXE):   %:      %.o $(SERVERLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
  
 $(MODEXE):      LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS)  $(MODEXE):      LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(MODEXE):      %:      %.o $(MODLIBS) $(MODEXE):      %:      %.o $(MODLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
Line 407  $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO
Line 362  $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO
 # 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) $(FMATHLIBS)  $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
 $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK) $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(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) $(ECPGLIBS) $(CFITSIOLIBS) $(FMATHLIBS)  $(MODEXE_USEF): LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(MODEXE_USEF):     %:  %.o $(MODLIBS) $(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) $(FMATHLIBS)  $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
 $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)


Legend:
Removed from v.1.54  
changed lines
  Added in v.1.56

Karen Tian
Powered by
ViewCVS 0.9.4