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

Diff for /JSOC/make_basic.mk between version 1.2 and 1.3

version 1.2, 2007/10/12 21:47:51 version 1.3, 2007/10/16 22:48:15
Line 105  endif
Line 105  endif
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
  
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     GCC_CF_ALL  = -I$(SRCDIR)/src/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   else
     GCC_CF_ALL  = -I$(SRCDIR)/src/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)
   endif   endif
  
   ICC_CF_ALL    = -I$(SRCDIR)/src/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)
  
 else else
  
   GCC_CF_ALL    = -I$(SRCDIR)/src/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)/src/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
  
Line 199  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
Line 199  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
 MATHLIBS =  $(LIBLSQR) $(LIBBLAS) $(LIBLAPACK) MATHLIBS =  $(LIBLSQR) $(LIBBLAS) $(LIBLAPACK)
  
 # Make rules that apply to all projects outside of the base DRMS/SUMS system # Make rules that apply to all projects outside of the base DRMS/SUMS system
 -include $(SRCDIR)/src/proj/make_basic.mk  -include $(SRCDIR)/proj/make_basic.mk
  
 # Make rules that apply to all projects, inside and outside of the base DRMS/SUMS system # Make rules that apply to all projects, inside and outside of the base DRMS/SUMS system
 $(CEXE):        %:      %.o $(EXELIBS) $(CEXE):        %:      %.o $(EXELIBS)


Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

Karen Tian
Powered by
ViewCVS 0.9.4