update Intel copyright years to 2014

[dpdk.git] / mk / rte.vars.mk

diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index 801b585..2973361 100644 (file)
--- a/mk/rte.vars.mk
+++ b/mk/rte.vars.mk
@@ -1,6 +1,6 @@
 #   BSD LICENSE
 # 
-#   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+#   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   All rights reserved.
 # 
 #   Redistribution and use in source and binary forms, with or without
@@ -64,9 +64,17 @@ ifneq ($(BUILDING_RTE_SDK),)
   RTE_TARGET := $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN)
   RTE_SDK_BIN := $(RTE_OUTPUT)
   RTE_BUILD_SHARED_LIB := $(CONFIG_RTE_BUILD_SHARED_LIB:"%"=%)
+  RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%s"=%)
+  ifeq ($(RTE_LIBNAME),)
+    RTE_LIBNAME := intel_dpdk
+  endif
   ifeq ($(RTE_BUILD_SHARED_LIB),)
     RTE_BUILD_SHARED_LIB := n
   endif
+  RTE_BUILD_COMBINE_LIBS := $(CONFIG_RTE_BUILD_COMBINE_LIBS:"%"=%)
+  ifeq ($(RTE_BUILD_COMBINE_LIBS),)
+    RTE_BUILD_COMBINE_LIBS := n
+  endif
 endif
 
 # RTE_TARGET is deducted from config when we are building the SDK.