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

Diff for /JSOC/make_basic.mk between version 1.17 and 1.24

version 1.17, 2008/04/18 21:25:32 version 1.24, 2008/07/15 20:59:32
Line 5  DBNAME = POSTGRESQL
Line 5  DBNAME = POSTGRESQL
 # USED BY NEITHER linux_x86_64 nor linux_ia32 # USED BY NEITHER linux_x86_64 nor linux_ia32
 PGIPATH = /usr/include/pgsql PGIPATH = /usr/include/pgsql
  
   ifeq ($(JSOC_MACHINE), mac_osx)
 COMPILER = gcc COMPILER = gcc
   else
   COMPILER = icc
   endif
  
 # Check for debug vs. release build - release is default. # Check for debug vs. release build - release is default.
 #   To do a debug build, either set the environment variable JSOC_DEBUG to 1, OR #   To do a debug build, either set the environment variable JSOC_DEBUG to 1, OR
 #   modify the following line so that DEBUG = 1.  The environment variable takes precedence. #   modify the following line so that DEBUG = 1.  The environment variable takes precedence.
 DEBUG = 1  DEBUG = 0
  
 ifdef JSOC_DEBUG ifdef JSOC_DEBUG
 ifeq ($(JSOC_DEBUG), 1) ifeq ($(JSOC_DEBUG), 1)
Line 41  endif
Line 44  endif
  
 _JSOCROOT_ = .. _JSOCROOT_ = ..
  
   ifeq ($(JSOC_MACHINE), mac_osx)
   F77 = f77
   else
 F77 = ifort F77 = ifort
   endif
   
 # if fortran compiler # if fortran compiler
 D_GCC_FORT = D_GCC_FORT =
 ifeq ($(F77), ifort) ifeq ($(F77), ifort)
Line 85  endif
Line 93  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
   ifeq ($(COMPILER), gcc)
           ifeq ($(JSOC_MACHINE), linux_x86_64)
                   FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio_gcc
                   CFITSIOLIBS = $(CFITSIOL) -lcfitsio_gcc
           endif
   endif
   
 GSLLIBS = $(GSLL) -lgsl -lgslcblas GSLLIBS = $(GSLL) -lgsl -lgslcblas
  
 ### Build flags for all targets ### Build flags for all targets
Line 101  endif
Line 116  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 193  FLINK = $(F77) $(F_LF_ALL) $(LF_TGT) -o
Line 207  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
 # #
Line 205  ifneq ($(COMPILER), icc)
Line 219  ifneq ($(COMPILER), icc)
 else else
   SYSLIBS = -lz -ldl -lpthread   SYSLIBS = -lz -ldl -lpthread
 endif endif
 SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)  SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDEFS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG)
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)  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 260  $(FMODEXE): LL_TGT := $(LL_TGT) $(CFITSI
Line 274  $(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.17  
changed lines
  Added in v.1.24
Karen Tian
 Powered by
ViewCVS 0.9.4