ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/make_basic.mk
(Generate patch)

Comparing make_basic.mk (file contents):
Revision 1.2 by arta, Fri Oct 12 21:47:51 2007 UTC vs.
Revision 1.3 by arta, Tue Oct 16 22:48:15 2007 UTC

# Line 105 | Line 105 | endif
105   ifeq ($(DEBUG), 0)
106  
107    ifeq ($(JSOC_MACHINE), linux_x86_64)
108 <    GCC_CF_ALL  = -I$(SRCDIR)/src/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP)
108 >    GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP)
109    else
110 <    GCC_CF_ALL  = -I$(SRCDIR)/src/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP)
110 >    GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP)
111    endif
112  
113 <  ICC_CF_ALL    = -I$(SRCDIR)/src/base/include -std=c99 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP)
113 >  ICC_CF_ALL    = -I$(SRCDIR)/base/include -std=c99 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP)
114  
115   else
116  
117 <  GCC_CF_ALL    = -I$(SRCDIR)/src/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP)
117 >  GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP)
118  
119 <  ICC_CF_ALL    = -I$(SRCDIR)/src/base/include -std=c99 -g $(ICC_WARN) $(ICC_CF_ICCCOMP)
119 >  ICC_CF_ALL    = -I$(SRCDIR)/base/include -std=c99 -g $(ICC_WARN) $(ICC_CF_ICCCOMP)
120  
121   endif
122  
# Line 199 | Line 199 | FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
199   MATHLIBS =  $(LIBLSQR) $(LIBBLAS) $(LIBLAPACK)
200  
201   # Make rules that apply to all projects outside of the base DRMS/SUMS system
202 < -include $(SRCDIR)/src/proj/make_basic.mk
202 > -include $(SRCDIR)/proj/make_basic.mk
203  
204   # Make rules that apply to all projects, inside and outside of the base DRMS/SUMS system
205   $(CEXE):        %:      %.o $(EXELIBS)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines