X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Frte.vars.mk;h=d5b36bedd903223710a1352db2e98fd73c5a986b;hb=5dd71363bfd2b8d33d6b7aea9ab43db5792fd4e2;hp=586b844e946783e8af6c247ebb810d32f7b72ebc;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index 586b844e94..d5b36bedd9 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 @@ -63,6 +63,19 @@ ifneq ($(BUILDING_RTE_SDK),) RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%) 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:"%"=%) + 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_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%) +ifeq ($(RTE_LIBNAME),) +RTE_LIBNAME := intel_dpdk endif # RTE_TARGET is deducted from config when we are building the SDK.