|
version 1.69, 2011/02/02 19:49:16
|
version 1.72, 2011/09/12 19:15:30
|
|
|
|
| VPATH = $(SRCDIR) | VPATH = $(SRCDIR) |
| STATIC = | STATIC = |
| DBNAME = POSTGRESQL |
DBMS = POSTGRESQL |
| | |
| # Run a script to determine the machine on which make is being run. This | # Run a script to determine the machine on which make is being run. This |
| # MAY return a machine type, if the host found falls into one of several | # MAY return a machine type, if the host found falls into one of several |
| Line 186 GCC_LF_ALL = $(STATIC) |
|
| Line 186 GCC_LF_ALL = $(STATIC) |
|
| ICC_LF_ALL = $(STATIC) -openmp -static-intel -Wl,-export-dynamic | ICC_LF_ALL = $(STATIC) -openmp -static-intel -Wl,-export-dynamic |
| | |
| # Fortran global LINK flags | # Fortran global LINK flags |
| F_LF_ALL = -nofor-main -openmp -static-intel |
F_LF_ALL = -nofor-main -openmp -static-intel -Wl,-export-dynamic |
| #***********************************************************************************************# | #***********************************************************************************************# |
| | |
| #***********************************************************************************************# | #***********************************************************************************************# |
| Line 198 ICC_CF_ICCCOMP = -DICCCOMP -openmp |
|
| Line 198 ICC_CF_ICCCOMP = -DICCCOMP -openmp |
|
| | |
| # 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) |
| GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) |
GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG |
| # -xW tells the icc compiler to optimize for Pentium 4 | # -xW tells the icc compiler to optimize for Pentium 4 |
| ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) |
ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG |
| | |
| ifeq ($(JSOC_MACHINE), linux_x86_64) | ifeq ($(JSOC_MACHINE), linux_x86_64) |
| GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) |
GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG |
| endif | endif |
| | |
| ifeq ($(JSOC_MACHINE), linux_ia64) | ifeq ($(JSOC_MACHINE), linux_ia64) |
| ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) |
ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG |
| endif | endif |
| | |
| ifeq ($(JSOC_MACHINE), linux_ia32) | ifeq ($(JSOC_MACHINE), linux_ia32) |
| GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) |
GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG |
| endif | endif |
| | |
| else | else |
Return to
make_basic.mk
CVS log
Up to [Development] / JSOC