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

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

version 1.6, 2008/02/29 23:30:21 version 1.7, 2008/03/04 18:44:31
Line 2  VPATH = $(SRCDIR)
Line 2  VPATH = $(SRCDIR)
 STATIC = STATIC =
 DBNAME = POSTGRESQL DBNAME = POSTGRESQL
  
   # USED BY NEITHER linux_x86_64 nor linux_ia32
 PGIPATH = /usr/include/pgsql PGIPATH = /usr/include/pgsql
  
   
 COMPILER = icc COMPILER = icc
  
 # Check for debug vs. release build - release is default. # Check for debug vs. release build - release is default.
Line 104  GCC_WARN = -Wno-comment
Line 106  GCC_WARN = -Wno-comment
 F77_WARN = -vec-report0 F77_WARN = -vec-report0
 endif endif
  
   # can't figure out how to get stupid make to do if/else if/else
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
  
     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)
     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)
   else  
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP)  
   endif   endif
  
   ICC_CF_ALL    = -I$(SRCDIR)/base/include -std=c99 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP)    ifeq ($(JSOC_MACHINE), linux_ia64)
       GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=itanium2 $(GCC_WARN) $(GCC_CF_GCCCOMP)
       ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 $(ICC_WARN) $(ICC_CF_ICCCOMP)
     endif
   
     ifeq ($(JSOC_MACHINE), linux_ia32)
       GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP)
     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)
   
   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)
  
 endif endif


Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

Karen Tian
Powered by
ViewCVS 0.9.4