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

Diff for /JSOC/make_basic.mk between version 1.11 and 1.21

version 1.11, 2008/03/10 18:19:13 version 1.21, 2008/06/23 18:43:00
Line 55  endif
Line 55  endif
 # Path to 3rd-party library headers # Path to 3rd-party library headers
 FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include
 CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include
   #CFITSIOH = -I/home/kehcheng/include
   GSLH = -I$(_JSOCROOT_)/lib_third_party/include
  
 ifeq ($(COMPILER), icc)  
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio
     # Path to 64-bit 3rd-party libraries     # Path to 64-bit 3rd-party libraries
     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/
   #  CFITSIOL = -L/home/kehcheng/lib/x86_64/
     # All 3rd-party math libraries - local rules can define a subset    GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
     FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio    ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
     CFITSIOLIBS = $(CFITSIOL) -lcfitsio  endif
   else  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
     # Path to 32-bit 3rd-party libraries     # Path to 32-bit 3rd-party libraries
     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/
   #  CFITSIOL = -L/home/kehcheng/lib/x86/
     GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
     ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
   endif
   ifeq ($(JSOC_MACHINE), mac_osx)
   #    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/mac_osx/
     CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/
   #  CFITSIOL = -L/home/kehcheng/lib/mac_osx/
     GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/
     ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/
   endif
  
     # All 3rd-party math libraries - local rules can define a subset     # All 3rd-party math libraries - local rules can define a subset
     FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio     FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio
     CFITSIOLIBS = $(CFITSIOL) -lcfitsio     CFITSIOLIBS = $(CFITSIOL) -lcfitsio
   endif  GSLLIBS = $(GSLL) -lgsl -lgslcblas
 endif  
  
 ### Build flags for all targets ### Build flags for all targets
 # #
Line 92  endif
Line 105  endif
 GCC_CF_GCCCOMP  = -DGCCCOMP $(D_GCC_FORT) GCC_CF_GCCCOMP  = -DGCCCOMP $(D_GCC_FORT)
 ICC_CF_ICCCOMP  = -DICCCOMP $(D_GCC_FORT) ICC_CF_ICCCOMP  = -DICCCOMP $(D_GCC_FORT)
  
   
 # Disable several warnings/remarks when compiling with icc - icc's Wall is a bit picky, it # Disable several warnings/remarks when compiling with icc - icc's Wall is a bit picky, it
 # complains about extern declarations in .c files. # complains about extern declarations in .c files.
 #   1418 (remark) - external function definition with no prior declaration #   1418 (remark) - external function definition with no prior declaration
Line 157  ICC_CMPLR = $(SRCDIR)/build/ccd-icc
Line 169  ICC_CMPLR = $(SRCDIR)/build/ccd-icc
 ARCHIVE         = ar crus $@ $^ ARCHIVE         = ar crus $@ $^
  
 ECPG            = ecpg -o $@ -c $< ECPG            = ecpg -o $@ -c $<
   SWIG            = swig -perl5 -o $@ $<
  
 GCC_COMP        = $(GCC_CMPLR) $(GCC_CF_ALL) $(CF_TGT) -o $@ -c $< GCC_COMP        = $(GCC_CMPLR) $(GCC_CF_ALL) $(CF_TGT) -o $@ -c $<
 ICC_COMP        = $(ICC_CMPLR) $(ICC_CF_ALL) $(CF_TGT) -o $@ -c $< ICC_COMP        = $(ICC_CMPLR) $(ICC_CF_ALL) $(CF_TGT) -o $@ -c $<
Line 183  FLINK = $(F77) $(F_LF_ALL) $(LF_TGT) -o
Line 196  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) $(LIBDSTRUCT_FPIC) $(LIBMISC_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)  ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBDSTRUCT_FPIC) $(LIBMISC_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
  
 ### Standard parts ### Standard parts
 # #
 include $(SRCDIR)/Rules.mk include $(SRCDIR)/Rules.mk
  
 # Libraries from src/util linked with all programs. # Libraries from src/util linked with all programs.
   ifneq ($(COMPILER), icc)
 SYSLIBS = -lz -ldl -lpthread -lm SYSLIBS = -lz -ldl -lpthread -lm
 SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)  else
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)    SYSLIBS = -lz -ldl -lpthread
   endif
   SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDEFS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG)
   FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDEFS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG)
  
 ########## Libraries to link for server executables,    ############## ########## Libraries to link for server executables,    ##############
 ########## standalone executables and pipeline modules. ############## ########## standalone executables and pipeline modules. ##############
Line 246  $(FMODEXE): LL_TGT := $(LL_TGT) $(CFITSI
Line 263  $(FMODEXE): LL_TGT := $(LL_TGT) $(CFITSI
 $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK) $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
   
   $(MODEXE_USEF): LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)
   $(MODEXE_USEF):     %:  %.o $(MODLIBS)
                           $(FLINK)
                           $(SLBIN)
   
   $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
   $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                           $(FLINK)
                           $(SLBIN)

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