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

Diff for /JSOC/make_basic.mk between version 1.40 and 1.43

version 1.40, 2009/04/10 20:19:49 version 1.43, 2009/04/17 00:34:25
Line 8  DBNAME = POSTGRESQL
Line 8  DBNAME = POSTGRESQL
 PGIPATH = /usr/include/pgsql PGIPATH = /usr/include/pgsql
  
 COMPILER = icc COMPILER = icc
   F77 = ifort
   
 ifeq ($(JSOC_MACHINE), mac_osx_ppc) ifeq ($(JSOC_MACHINE), mac_osx_ppc)
 COMPILER = gcc COMPILER = gcc
   F77 = f77
 endif endif
 ifeq ($(JSOC_MACHINE), mac_osx_ia32) ifeq ($(JSOC_MACHINE), mac_osx_ia32)
 COMPILER = gcc COMPILER = gcc
   F77 = f77
 endif endif
  
 # Check for debug vs. release build - release is default. # Check for debug vs. release build - release is default.
Line 48  endif
Line 52  endif
  
 _JSOCROOT_ = .. _JSOCROOT_ = ..
  
 ifeq ($(JSOC_MACHINE), mac_osx)  
 F77 = f77  
 else  
 F77 = ifort  
 endif  
   
 # if fortran compiler # if fortran compiler
 D_GCC_FORT = D_GCC_FORT =
 ifeq ($(F77), ifort) ifeq ($(F77), ifort)
Line 61  ifeq ($(F77), ifort)
Line 59  ifeq ($(F77), ifort)
 endif endif
  
 ifeq ($(JSOC_MACHINE), linux_x86_64) ifeq ($(JSOC_MACHINE), linux_x86_64)
     ifeq ($(F77), ifort)
   F77 = ifort -mcmodel=medium   F77 = ifort -mcmodel=medium
 endif endif
   endif
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #
Line 242  FLINK = $(F77) $(F_LF_ALL) $(LF_TGT) -o
Line 242  FLINK = $(F77) $(F_LF_ALL) $(LF_TGT) -o
 SLBIN           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../bin/$(JSOC_MACHINE)/ SLBIN           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../bin/$(JSOC_MACHINE)/
 SLLIB           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../lib/$(JSOC_MACHINE)/ SLLIB           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../lib/$(JSOC_MACHINE)/
  
 ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBDSTRUCT_FPIC) $(LIBMISC_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)  ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBMISC_FPIC) $(LIBDSTRUCT_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
  
 ### Standard parts ### Standard parts
 # #
Line 254  ifneq ($(COMPILER), icc)
Line 254  ifneq ($(COMPILER), icc)
 else else
   SYSLIBS = -lz -ldl -lpthread   SYSLIBS = -lz -ldl -lpthread
 endif endif
 SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC)  SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC) $(LIBDSTRUCT)
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC)  FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC) $(LIBDSTRUCT)
  
 ########## Libraries to link for server executables,    ############## ########## Libraries to link for server executables,    ##############
 ########## standalone executables and pipeline modules. ############## ########## standalone executables and pipeline modules. ##############
Line 276  MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LI
Line 276  MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LI
 # FMODLIBS: Libraries linked with DRMS Fortran modules # FMODLIBS: Libraries linked with DRMS Fortran modules
 FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS) FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS)
  
 MATHLIBS =  $(LIBLSQR) $(LIBBLAS) $(LIBLAPACK)  
   
 # 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)/proj/make_basic.mk
  
Line 286  $(CEXE): %: %.o $(EXELIBS)
Line 284  $(CEXE): %: %.o $(EXELIBS)
                 $(LINK)                 $(LINK)
                 $(SLBIN)                 $(SLBIN)
  
 $(FEXE):        %:      %.o $(MATHLIBS)  $(FEXE):        %:      %.o $(FMATHLIBS)
                 $(FLINK)                 $(FLINK)
                 $(SLBIN)                 $(SLBIN)
  
Line 304  $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CF
Line 302  $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CF
 $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
 # FMODEXE 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):     LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)  $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)
 $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)  $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
  

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