From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Wed, 22 Feb 2012 13:45:20 +0000 (+0200)
Subject: Fix makefiles
X-Git-Tag: vofed-3.5-x~105
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=55379a99264a53afa3cfc82594ee14b5513b0141;p=~tnikolova%2Fcompat-rdma%2F.git

Fix makefiles

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

diff --git a/Makefile b/Makefile
index 97d957c..461e175 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,3 @@
-EXTRA_CFLAGS += $(OPENIB_KERNEL_EXTRA_CFLAGS) \
-		$(KERNEL_MEMTRACK_CFLAGS) \
-		$(KERNEL_NFS_FS_CFLAGS) \
-		-I$(CWD)/include \
-		-I$(CWD)/drivers/infiniband/ulp/ipoib \
-		-I$(CWD)/drivers/infiniband/debug \
-		-I$(CWD)/drivers/net/ethernet/chelsio/cxgb3 \
-		-I$(CWD)/drivers/net/ethernet/chelsio/cxgb4 \
-		-I$(CWD)/net/rds \
-		-I$(CWD)/drivers/net/ethernet/mellanox/mlx4 \
-		-I$(CWD)/drivers/infiniband/hw/mlx4 \
-        -DCOMPAT_BASE_TREE="\"$(shell cat compat_base_tree)\"" \
-        -DCOMPAT_BASE_TREE_VERSION="\"$(shell cat compat_base_tree_version)\"" \
-        -DCOMPAT_PROJECT="\"Compat-rdma\"" \
-        -DCOMPAT_VERSION="\"$(shell cat compat_version)\""
-
 obj-y := compat/
 obj-$(CONFIG_INFINIBAND)        += drivers/infiniband/
 obj-$(CONFIG_CHELSIO_T3)        += drivers/net/ethernet/chelsio/cxgb3/
diff --git a/makefile b/makefile
index 24b7284..40f16d1 100644
--- a/makefile
+++ b/makefile
@@ -15,6 +15,11 @@ include ./config.mk
 export CREL=$(shell cat $(CWD)/compat_version)
 export CREL_PRE:=.compat_autoconf_
 export CREL_CHECK:=$(CREL_PRE)$(CREL)
+CFLAGS += \
+	-DCOMPAT_BASE_TREE="\"$(shell cat compat_base_tree)\"" \
+	-DCOMPAT_BASE_TREE_VERSION="\"$(shell cat compat_base_tree_version)\"" \
+	-DCOMPAT_PROJECT="\"Compat-rdma\"" \
+	-DCOMPAT_VERSION="\"$(shell cat compat_version)\"" \
 
 DEPMOD  = /sbin/depmod
 INSTALL_MOD_DIR ?= $(shell test -f /etc/redhat-release && echo extra/ofa_kernel || echo updates)
@@ -111,14 +116,11 @@ kernel:
 		CONFIG_NFSD_RDMA=$(CONFIG_NFSD_RDMA) \
 		LINUXINCLUDE=' \
 		-D__OFED_BUILD__ \
-		-DCOMPAT_BASE_TREE="\"$(shell cat compat_base_tree)\"" \
-        	-DCOMPAT_BASE_TREE_VERSION="\"$(shell cat compat_base_tree_version)\"" \
-        	-DCOMPAT_PROJECT="\"Compat-rdma\"" \
-        	-DCOMPAT_VERSION="\"$(shell cat compat_version)\"" \
+		$(CFLAGS) \
 		-include $(autoconf_h) \
 		-include $(CWD)/include/linux/autoconf.h \
 		$(KCONFIG_H) \
-		-include ../include/linux/compat-2.6.h \
+		-include $(CWD)/include/linux/compat-2.6.h \
 		$(BACKPORT_INCLUDES) \
 		$(KERNEL_MEMTRACK_CFLAGS) \
 		$(KERNEL_NFS_FS_CFLAGS) \