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

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

version 1.21, 2008/06/23 18:43:00 version 1.32, 2008/12/03 18:28:31
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
   -include $(SRCDIR)/custom.mk
   
 # 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
  
   
 COMPILER = icc COMPILER = icc
   ifeq ($(JSOC_MACHINE), mac_osx_ppc)
   COMPILER = gcc
   endif
   ifeq ($(JSOC_MACHINE), mac_osx_ia32)
   COMPILER = gcc
   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
Line 24  endif
Line 32  endif
 # No warnings are displayed, by default, for a release build. # No warnings are displayed, by default, for a release build.
 WARN = 0 WARN = 0
  
 # Builder can request warnings via environment variable (setenv JSOC_WARN 1).  The  # Builder can request warnings via environment variable (setenv JSOC_WARN 1).
 #   environment variable takes precedence.  #   The environment variable takes precedence.
 ifdef JSOC_WARN ifdef JSOC_WARN
 ifeq ($(JSOC_WARN), 1) ifeq ($(JSOC_WARN), 1)
 WARN = 1 WARN = 1
Line 41  endif
Line 49  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 55  endif
Line 68  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 GSLH = -I$(_JSOCROOT_)/lib_third_party/include
  
 ifeq ($(JSOC_MACHINE), linux_x86_64) ifeq ($(JSOC_MACHINE), linux_x86_64)
Line 63  ifeq ($(JSOC_MACHINE), linux_x86_64)
Line 75  ifeq ($(JSOC_MACHINE), linux_x86_64)
   # 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/  
   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
Line 72  ifeq ($(JSOC_MACHINE), linux_ia32)
Line 83  ifeq ($(JSOC_MACHINE), linux_ia32)
   # 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/   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)  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
   # Path to 32-bit 3rd-party libraries    # Path to appropriate 3rd-party libraries
   FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
 #  CFITSIOL = -L/home/kehcheng/lib/mac_osx/    GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/    ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
   ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx/  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 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)
                   ifneq ($(CFITSIOFNAME_GCC_X86_64),)
                           FMATHLIBS = $(FMATHLIBSL) -lfftw3f -l$(CFITSIOFNAME_GCC_X86_64)
                           CFITSIOLIBS = $(CFITSIOL) -l$(CFITSIOFNAME_GCC_X86_64)
                   endif
           endif
   endif
   
 GSLLIBS = $(GSLL) -lgsl -lgslcblas GSLLIBS = $(GSLL) -lgsl -lgslcblas
  
   # Compilation define customizations (eg., for remote DRMS builds)
   CUSTOMSW =
   ifneq ($(DRMS_DEFAULT_RETENTION),)
   #       CUSTOMSW = $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION="\"$(DRMS_DEFAULT_RETENTION)\""
           CUSTOMSW := $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION=$(DRMS_DEFAULT_RETENTION)
   endif
   
 ### Build flags for all targets ### Build flags for all targets
 # #
 LL_ALL          = $(SYSLIBS) LL_ALL          = $(SYSLIBS)
Line 126  endif
Line 160  endif
  
 # can't figure out how to get stupid make to do if/else if/else # can't figure out how to get stupid make to do if/else if/else
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
   GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP)    GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
   ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP)    ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
  
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP)      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia64)   ifeq ($(JSOC_MACHINE), linux_ia64)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP)      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
     ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 $(ICC_WARN) $(ICC_CF_ICCCOMP)      ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia32)   ifeq ($(JSOC_MACHINE), linux_ia32)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP)      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
   endif   endif
  
 else else
  
   GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP)    GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
   ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -g $(ICC_WARN) $(ICC_CF_ICCCOMP)    ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -g $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
  
 endif endif
  
Line 204  include $(SRCDIR)/Rules.mk
Line 238  include $(SRCDIR)/Rules.mk
  
 # Libraries from src/util linked with all programs. # Libraries from src/util linked with all programs.
 ifneq ($(COMPILER), icc) ifneq ($(COMPILER), icc)
   SYSLIBS = -lz -ldl -lpthread -lm    SYSLIBS = -lz -ldl -lpthread -lrt -lm
 else else
   SYSLIBS = -lz -ldl -lpthread    SYSLIBS = -lz -ldl -lpthread -lrt
 endif endif
 SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDEFS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG)  SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBDEFS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC)
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDEFS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG)  FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBDEFS) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC)
  
 ########## Libraries to link for server executables,    ############## ########## Libraries to link for server executables,    ##############
 ########## standalone executables and pipeline modules. ############## ########## standalone executables and pipeline modules. ##############

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