From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
Subject: [virtio-net-pmd PATCH 09/16] mk: minor fixes
Date: Tue,  4 Feb 2014 16:54:24 +0100
Message-ID: <1391529271-24606-10-git-send-email-thomas.monjalon@6wind.com>
References: <1391529271-24606-1-git-send-email-thomas.monjalon@6wind.com>
To: dev-VfR2kkLFssw@public.gmane.org
Return-path: <dev-bounces-VfR2kkLFssw@public.gmane.org>
In-Reply-To: <1391529271-24606-1-git-send-email-thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request-VfR2kkLFssw@public.gmane.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev-VfR2kkLFssw@public.gmane.org>
List-Help: <mailto:dev-request-VfR2kkLFssw@public.gmane.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request-VfR2kkLFssw@public.gmane.org?subject=subscribe>
Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org
Sender: "dev" <dev-bounces-VfR2kkLFssw@public.gmane.org>

Fix help.
Also define CC and remove RTE_CONFIG variable.

Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 Makefile |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d90f23e..4b51057 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2013 6WIND S.A.
+# Copyright 2013-2014 6WIND S.A.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -29,19 +29,19 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 
+SOLIB = librte_pmd_virtio.so
+
+CC = $(CROSS)gcc
 override CPPFLAGS += -Wall -Wextra -Werror
 override CFLAGS   += -fPIC
 override LDFLAGS  += -shared
 
-RTE_CONFIG = $(RTE_INCLUDE)/rte_config.h
-SOLIB = librte_pmd_virtio.so
-
 all :
 ifeq '$(RTE_INCLUDE)' ''
 	@ echo 'ERROR: RTE_INCLUDE is not set' && false
 endif
-	$(CROSS)gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-		-I$(RTE_INCLUDE) -include $(RTE_CONFIG) \
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+		-I$(RTE_INCLUDE) -include $(RTE_INCLUDE)/rte_config.h \
 		-o $(SOLIB) virtio_user.c
 
 clean :
@@ -52,6 +52,7 @@ help :
 	@ echo '    all (default)'
 	@ echo '    clean'
 	@ echo 'variables:'
-	@ echo '    RTE_INCLUDE (e.g. ../dpdk/build/include)'
+	@ echo '    RTE_INCLUDE (e.g. ../dpdk/build/include),'
+	@ echo '    CPPFLAGS, CFLAGS, LDFLAGS'
 
-.PHONY : all clean
+.PHONY : all clean help
-- 
1.7.10.4