summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2014-02-03 16:54:34 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-03-27 10:23:05 +0100
commitf6b2e876d1cd2702f967507165db787945b9fc6e (patch)
treef8723c5216c6bcc828229c6b7c834b6d4082ef8d
parent25d32e762672eb7d577e382576ed8cdd3a8baa74 (diff)
downloadvirtio-net-pmd-f6b2e876d1cd2702f967507165db787945b9fc6e.zip
virtio-net-pmd-f6b2e876d1cd2702f967507165db787945b9fc6e.tar.gz
virtio-net-pmd-f6b2e876d1cd2702f967507165db787945b9fc6e.tar.xz
mk: minor fixes
Fix help. Also define CC and remove RTE_CONFIG variable. Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com> Reviewed-by: Olivier Matz <olivier.matz@6wind.com>
-rw-r--r--Makefile17
1 files 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