ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/JSOC/make_basic.mk

Comparing make_basic.mk (file contents):
Revision 1.30 by arta, Thu Oct 16 22:08:04 2008 UTC vs.
Revision 1.31 by arta, Wed Nov 19 00:57:45 2008 UTC

#	Line 118 | Line 118 | endif
118
119		GSLLIBS = $(GSLL) -lgsl -lgslcblas
120
121	+	# Compilation define customizations (eg., for remote DRMS builds)
122	+	CUSTOMSW =
123	+	ifneq ($(DRMS_DEFAULT_RETENTION),)
124	+	#       CUSTOMSW = $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION="\"$(DRMS_DEFAULT_RETENTION)\""
125	+	CUSTOMSW := $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION=$(DRMS_DEFAULT_RETENTION)
126	+	endif
127	+
128		### Build flags for all targets
129		#
130		LL_ALL          = $(SYSLIBS)
#	Line 153 | Line 160 | endif
160
161		# can't figure out how to get stupid make to do if/else if/else
162		ifeq ($(DEBUG), 0)
163	<	GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP)
164	<	ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP)
163	>	GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
164	>	ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
165
166		ifeq ($(JSOC_MACHINE), linux_x86_64)
167	<	GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP)
167	>	GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
168		endif
169
170		ifeq ($(JSOC_MACHINE), linux_ia64)
171	<	GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP)
172	<	ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 $(ICC_WARN) $(ICC_CF_ICCCOMP)
171	>	GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
172	>	ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
173		endif
174
175		ifeq ($(JSOC_MACHINE), linux_ia32)
176	<	GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP)
176	>	GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
177		endif
178
179		else
180
181	<	GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP)
182	<	ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -g $(ICC_WARN) $(ICC_CF_ICCCOMP)
181	>	GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
182	>	ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -g $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
183
184		endif
185

Diff Legend

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