X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=mk%2Frte.vars.mk;h=1e874ee34338039595438cf26db094cacb65debc;hb=1b9ea09c067b6d70d94e72410c78b13669912c3f;hp=297336177f61b02db4be438ac53e724b0d3f4744;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index 297336177f..1e874ee343 100644 --- a/mk/rte.vars.mk +++ b/mk/rte.vars.mk @@ -1,12 +1,12 @@ # BSD LICENSE -# +# # 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 @@ -64,10 +64,6 @@ 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 @@ -75,6 +71,10 @@ ifneq ($(BUILDING_RTE_SDK),) 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.