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

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

version 1.24, 2008/07/15 20:59:32 version 1.25, 2008/07/16 18:51:33
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
  
Line 93  endif
Line 96  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 ($(COMPILER), gcc)
         ifeq ($(JSOC_MACHINE), linux_x86_64)         ifeq ($(JSOC_MACHINE), linux_x86_64)
                 FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio_gcc                  ifneq ($(CFITSIOFNAME_GCC_X86_64),)
                 CFITSIOLIBS = $(CFITSIOL) -lcfitsio_gcc                          FMATHLIBS = $(FMATHLIBSL) -lfftw3f -l$(CFITSIOFNAME_GCC_X86_64)
                           CFITSIOLIBS = $(CFITSIOL) -l$(CFITSIOFNAME_GCC_X86_64)
                   endif
         endif         endif
 endif endif
  

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