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.56 by arta, Tue Sep 22 17:43:03 2009 UTC vs.
Revision 1.57 by arta, Tue Sep 22 22:49:55 2009 UTC

# Line 7 | Line 7 | _JSOCROOT_ = ..
7   # This optional file has custom definitions created by the configure script
8   -include $(SRCDIR)/custom.mk
9  
10 + ifeq ($(MACH),)
11 + MACH = $(JSOC_MACHINE)
12 + endif
13 +
14   #***********************************************************************************************#
15   #
16   # COMPILER SELECTION
# Line 125 | Line 129 | endif
129   #
130   #***********************************************************************************************#
131  
132 + #***********************************************************************************************#
133 + #
134 + # Global flags
135 + #
136 + # All modules must be able to find libdsds.so. The define DRMS_LIBDIR specifies the path to
137 + # all libraries.
138 +
139 + GLOBALSW = -DDRMS_LIBDIR="\"$(CURDIR)/../lib/$(MACH)\""
140 + #
141 + #***********************************************************************************************#
142  
143   #***********************************************************************************************#
144   #
# Line 191 | Line 205 | endif
205  
206   # can't figure out how to get stupid make to do if/else if/else
207   ifeq ($(DEBUG), 0)
208 <  GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
208 >  GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
209   # -xW tells the icc compiler to optimize for Pentium 4
210 <  ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(CCFLAGS_OPT) $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
210 >  ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(CCFLAGS_OPT) $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)
211  
212    ifeq ($(JSOC_MACHINE), linux_x86_64)
213 <    GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
213 >    GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
214    endif
215  
216    ifeq ($(JSOC_MACHINE), linux_ia64)
217 <    ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
217 >    ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)
218    endif
219  
220    ifeq ($(JSOC_MACHINE), linux_ia32)
221 <    GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
221 >    GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
222    endif
223  
224   else
225   # -g tells the icc and gcc compilers to generate full debugging information
226 <  GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
227 <  ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE -g $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
226 >  GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
227 >  ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE -g $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)
228   endif
229  
230   # Fortran global COMPILE flags

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines