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

Diff for /JSOC/make_basic.mk between version 1.9 and 1.10

version 1.9, 2008/03/04 23:42:12 version 1.10, 2008/03/05 15:56:13
Line 81  endif
Line 81  endif
 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 112  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)
 # defaults for generic architecture  
   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)
   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)
  
Line 117  ifeq ($(DEBUG), 0)
Line 120  ifeq ($(DEBUG), 0)
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia64)   ifeq ($(JSOC_MACHINE), linux_ia64)
 # these are superfluous, since they are identical to the generic defines  
     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)
     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


Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

Karen Tian
Powered by
ViewCVS 0.9.4