X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Frte.vars.mk;h=1e874ee34338039595438cf26db094cacb65debc;hb=9aaccf1abdb2894ec23870e1d2199a657f85850e;hp=801b5857d60e64588bd22cf7a8cfbb4225ed17e4;hpb=e25e4d7ef16b8aa84de7b0c93c48260b68c86fbe;p=dpdk.git

diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index 801b5857d6..1e874ee343 100644
--- a/mk/rte.vars.mk
+++ b/mk/rte.vars.mk
@@ -1,12 +1,12 @@
 #   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
 #   modification, are permitted provided that the following conditions
 #   are met:
-# 
+#
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above copyright
@@ -16,7 +16,7 @@
 #     * Neither the name of Intel Corporation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 #   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 #   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -67,6 +67,14 @@ ifneq ($(BUILDING_RTE_SDK),)
   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
+  RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)
+  ifeq ($(RTE_LIBNAME),)
+    RTE_LIBNAME := intel_dpdk
+  endif
 endif
 
 # RTE_TARGET is deducted from config when we are building the SDK.