From d0e731e8b825e7a554f245aa8f1118dcec9e2728 Mon Sep 17 00:00:00 2001
From: Jameson Nash <jameson@mit.edu>
Date: Tue, 21 Aug 2012 00:31:12 -0400
Subject: [PATCH] provide support for passing CFLAGS, FFLAGS, PFLAGS, FPFLAGS
 to make on the command line

---
 Makefile.system        |  9 +++++----
 Makefile.tail          | 24 ++++++++++++------------
 ctest/Makefile         |  2 +-
 driver/others/Makefile |  4 ++--
 interface/Makefile     |  6 +++---
 kernel/Makefile        |  2 +-
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/Makefile.system b/Makefile.system
index b2180f30d..e5279d407 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -696,11 +696,12 @@ COMMON_OPT = -O2
 endif
 
 
-CFLAGS     = $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR)
-PFLAGS     = $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -DPROFILE $(COMMON_PROF)
+override CFLAGS     += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR)
+override PFLAGS     += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -DPROFILE $(COMMON_PROF)
 
-FFLAGS     = $(COMMON_OPT) $(FCOMMON_OPT)
-FPFLAGS    = $(COMMON_OPT) $(FCOMMON_OPT) $(COMMON_PROF)
+override FFLAGS     += $(COMMON_OPT) $(FCOMMON_OPT)
+override FPFLAGS    += $(COMMON_OPT) $(FCOMMON_OPT) $(COMMON_PROF)
+#MAKEOVERRIDES =
 
 ifndef SUFFIX
 SUFFIX  = o
diff --git a/Makefile.tail b/Makefile.tail
index 64f98ab0c..53dd0caad 100644
--- a/Makefile.tail
+++ b/Makefile.tail
@@ -22,19 +22,19 @@ BLASOBJS   += $(QBLASOBJS)   $(XBLASOBJS)
 BLASOBJS_P += $(QBLASOBJS_P) $(XBLASOBJS_P)
 endif
 
-$(SBLASOBJS) $(SBLASOBJS_P) : CFLAGS += -UDOUBLE  -UCOMPLEX
-$(DBLASOBJS) $(DBLASOBJS_P) : CFLAGS += -DDOUBLE  -UCOMPLEX
-$(QBLASOBJS) $(QBLASOBJS_P) : CFLAGS += -DXDOUBLE -UCOMPLEX
-$(CBLASOBJS) $(CBLASOBJS_P) : CFLAGS += -UDOUBLE  -DCOMPLEX
-$(ZBLASOBJS) $(ZBLASOBJS_P) : CFLAGS += -DDOUBLE  -DCOMPLEX
-$(XBLASOBJS) $(XBLASOBJS_P) : CFLAGS += -DXDOUBLE -DCOMPLEX
+$(SBLASOBJS) $(SBLASOBJS_P) : override CFLAGS += -UDOUBLE  -UCOMPLEX
+$(DBLASOBJS) $(DBLASOBJS_P) : override CFLAGS += -DDOUBLE  -UCOMPLEX
+$(QBLASOBJS) $(QBLASOBJS_P) : override CFLAGS += -DXDOUBLE -UCOMPLEX
+$(CBLASOBJS) $(CBLASOBJS_P) : override CFLAGS += -UDOUBLE  -DCOMPLEX
+$(ZBLASOBJS) $(ZBLASOBJS_P) : override CFLAGS += -DDOUBLE  -DCOMPLEX
+$(XBLASOBJS) $(XBLASOBJS_P) : override CFLAGS += -DXDOUBLE -DCOMPLEX
 
-$(SBLASOBJS_P) : CFLAGS += -DPROFILE $(COMMON_PROF)
-$(DBLASOBJS_P) : CFLAGS += -DPROFILE $(COMMON_PROF)
-$(QBLASOBJS_P) : CFLAGS += -DPROFILE $(COMMON_PROF)
-$(CBLASOBJS_P) : CFLAGS += -DPROFILE $(COMMON_PROF)
-$(ZBLASOBJS_P) : CFLAGS += -DPROFILE $(COMMON_PROF)
-$(XBLASOBJS_P) : CFLAGS += -DPROFILE $(COMMON_PROF)
+$(SBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
+$(DBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
+$(QBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
+$(CBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
+$(ZBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
+$(XBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
 
 libs    :: $(BLASOBJS) $(COMMONOBJS)
 	$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
diff --git a/ctest/Makefile b/ctest/Makefile
index 1e07bd154..b1295640f 100644
--- a/ctest/Makefile
+++ b/ctest/Makefile
@@ -5,7 +5,7 @@
 TOPDIR = ..
 include $(TOPDIR)/Makefile.system
 
-CFLAGS += -DADD$(BU) -DCBLAS
+override CFLAGS += -DADD$(BU) -DCBLAS
 
 LIB = $(TOPDIR)/$(LIBNAME)
 
diff --git a/driver/others/Makefile b/driver/others/Makefile
index 921f47c9c..a1c7a504e 100644
--- a/driver/others/Makefile
+++ b/driver/others/Makefile
@@ -215,7 +215,7 @@ info.$(SUFFIX) : info.c info.h ../../common.h ../../param.h
 	$(CC) $(CFLAGS) -c $< -o $(@F)
 
 
-hpl   : CFLAGS += -DHPL
-hpl_p : CFLAGS += -DHPL
+hpl   : override CFLAGS += -DHPL
+hpl_p : override CFLAGS += -DHPL
 
 include $(TOPDIR)/Makefile.tail
diff --git a/interface/Makefile b/interface/Makefile
index 5cf11cd9b..93892206f 100644
--- a/interface/Makefile
+++ b/interface/Makefile
@@ -318,7 +318,7 @@ CZBLAS3OBJS   = \
 
 ifndef NO_CBLAS
 
-CFLAGS += -I.
+override CFLAGS += -I.
 
 SBLAS1OBJS   += $(CSBLAS1OBJS)
 SBLAS2OBJS   += $(CSBLAS2OBJS)
@@ -400,7 +400,7 @@ all :: libs
 
 ifdef FUNCTION_PROFILE
 $(BLASOBJS) $(BLASOBJS_P) : functable.h
-$(BLASOBJS) $(BLASOBJS_P) : CFLAGS += -DPROFILE_FUNC_NAME=interface_$(*F)
+$(BLASOBJS) $(BLASOBJS_P) : override CFLAGS += -DPROFILE_FUNC_NAME=interface_$(*F)
 
 functable.h : Makefile
 	./create $(FUNCALLFILES) > functable.h
@@ -420,7 +420,7 @@ level3 : $(SBLAS3OBJS) $(DBLAS3OBJS) $(QBLAS3OBJS) $(CBLAS3OBJS) $(ZBLAS3OBJS) $
 	$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^
 
 $(CSBLASOBJS) $(CSBLASOBJS_P) $(CDBLASOBJS) $(CDBLASOBJS_P) $(CQBLASOBJS) $(CQBLASOBJS_P) \
-$(CCBLASOBJS) $(CCBLASOBJS_P) $(CZBLASOBJS) $(CZBLASOBJS_P) $(CXBLASOBJS) $(CXBLASOBJS_P) : CFLAGS += -DCBLAS
+$(CCBLASOBJS) $(CCBLASOBJS_P) $(CZBLASOBJS) $(CZBLASOBJS_P) $(CXBLASOBJS) $(CXBLASOBJS_P) : override CFLAGS += -DCBLAS
 
 srot.$(SUFFIX) srot.$(PSUFFIX) : rot.c
 	$(CC) $(CFLAGS) -c $< -o $(@F)
diff --git a/kernel/Makefile b/kernel/Makefile
index 41c5e89fd..55edcd287 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -6,7 +6,7 @@ TOPDIR	= ..
 include $(TOPDIR)/Makefile.system
 
 ifdef TARGET_CORE
-CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE)
+override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE)
 BUILD_KERNEL = 1
 KDIR =
 TSUFFIX = _$(TARGET_CORE)