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

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

version 1.7, 2008/03/04 18:44:31 version 1.17, 2008/04/18 21:25:32
Line 6  DBNAME = POSTGRESQL
Line 6  DBNAME = POSTGRESQL
 PGIPATH = /usr/include/pgsql PGIPATH = /usr/include/pgsql
  
  
 COMPILER = icc  COMPILER = gcc
  
 # 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 = 0  DEBUG = 1
  
 ifdef JSOC_DEBUG ifdef JSOC_DEBUG
 ifeq ($(JSOC_DEBUG), 1) ifeq ($(JSOC_DEBUG), 1)
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
   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/
     GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
     # All 3rd-party math libraries - local rules can define a subset    ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
     FMATHLIBS = $(FMATHLIBSL) -lfftw3f -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/
     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/
     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
   endif  CFITSIOLIBS = $(CFITSIOL) -lcfitsio
 endif  GSLLIBS = $(GSLL) -lgsl -lgslcblas
  
 ### Build flags for all targets ### Build flags for all targets
 # #
 LL_ALL          = $(SYSLIBS) LL_ALL          = $(SYSLIBS)
  
 GCC_LF_ALL      = $(STATIC) -g GCC_LF_ALL      = $(STATIC) -g
   ifeq ($(JSOC_MACHINE), linux_ia64)
     ICC_LF_ALL    = $(STATIC)
   else
 ICC_LF_ALL      = $(STATIC) -xW ICC_LF_ALL      = $(STATIC) -xW
   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)
Line 108  endif
Line 123  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)
   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)
  
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
Line 116  ifeq ($(DEBUG), 0)
Line 131  ifeq ($(DEBUG), 0)
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia64)   ifeq ($(JSOC_MACHINE), linux_ia64)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=itanium2 $(GCC_WARN) $(GCC_CF_GCCCOMP)      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP)
     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)
   endif   endif
  
Line 151  ICC_CMPLR = $(SRCDIR)/build/ccd-icc
Line 166  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 184  ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(
Line 200  ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(
 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
   else
     SYSLIBS = -lz -ldl -lpthread
   endif
 SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW)
  
Line 221  $(FEXE): %: %.o $(MATHLIBS)
Line 241  $(FEXE): %: %.o $(MATHLIBS)
                 $(FLINK)                 $(FLINK)
                 $(SLBIN)                 $(SLBIN)
  
 $(SERVEREXE):   LL_TGT := $(LL_TGT) -lpq  $(SERVEREXE):   LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)
 $(SERVEREXE):   %:      %.o $(SERVERLIBS) $(SERVEREXE):   %:      %.o $(SERVERLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
  
 $(MODEXE):      LL_TGT := $(LL_TGT) -lpq  $(MODEXE):      LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)
 $(MODEXE):      %:      %.o $(MODLIBS) $(MODEXE):      %:      %.o $(MODLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
  
   $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
 $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
  
   $(FMODEXE):     LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
 $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK) $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)

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