From e7c6d6fc2233782322ac6d0156f1b3dde3a19d6f Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 8 Jul 2015 12:34:26 +0200 Subject: [PATCH] mk: remove variables identical to config ones CONFIG_RTE_BUILD_SHARED_LIB and CONFIG_RTE_BUILD_COMBINE_LIBS does not have quotes in their values (only y or n). That's why the variables RTE_BUILD_SHARED_LIB and RTE_BUILD_COMBINE_LIBS are always identical to their CONFIG_ counterpart, and are useless. In order to have consistent naming of config options in the makefiles, these options are removed and the "CONFIG_ prefixed" variables are used. Fixes: e25e4d7ef16b ("mk: shared libraries") Fixes: 4d3d79e7a5c6 ("mk: combined library") Signed-off-by: Thomas Monjalon Acked-by: Neil Horman --- mk/exec-env/bsdapp/rte.vars.mk | 4 ++-- mk/exec-env/linuxapp/rte.vars.mk | 4 ++-- mk/rte.lib.mk | 12 ++++++------ mk/rte.sdkbuild.mk | 2 +- mk/rte.sharelib.mk | 8 ++++---- mk/rte.vars.mk | 8 -------- 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/bsdapp/rte.vars.mk index aed0e18d61..47a673e7da 100644 --- a/mk/exec-env/bsdapp/rte.vars.mk +++ b/mk/exec-env/bsdapp/rte.vars.mk @@ -39,7 +39,7 @@ # # examples for RTE_EXEC_ENV: linuxapp, bsdapp # -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC else EXECENV_CFLAGS = -pthread @@ -49,7 +49,7 @@ EXECENV_LDFLAGS = EXECENV_LDLIBS = -lexecinfo EXECENV_ASFLAGS = -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_LDLIBS += -lgcc_s endif diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linuxapp/rte.vars.mk index e5af31808e..5fd7d85578 100644 --- a/mk/exec-env/linuxapp/rte.vars.mk +++ b/mk/exec-env/linuxapp/rte.vars.mk @@ -39,7 +39,7 @@ # # examples for RTE_EXEC_ENV: linuxapp, bsdapp # -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC else EXECENV_CFLAGS = -pthread @@ -51,7 +51,7 @@ EXECENV_LDFLAGS = --no-as-needed EXECENV_LDLIBS = -lrt -lm EXECENV_ASFLAGS = -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_LDLIBS += -lgcc_s endif diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk index 25aa989cae..fff62a7679 100644 --- a/mk/rte.lib.mk +++ b/mk/rte.lib.mk @@ -37,7 +37,7 @@ include $(RTE_SDK)/mk/internal/rte.depdirs-pre.mk # VPATH contains at least SRCDIR VPATH += $(SRCDIR) -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) @@ -87,7 +87,7 @@ O_TO_S_DO = @set -e; \ $(O_TO_S) && \ echo $(O_TO_S_CMD) > $(call exe2cmd,$(@)) -ifeq ($(RTE_BUILD_SHARED_LIB),n) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) O_TO_C = $(AR) crus $(LIB_ONE) $(OBJS-y) O_TO_C_STR = $(subst ','\'',$(O_TO_C)) #'# fix syntax highlight O_TO_C_DISP = $(if $(V),"$(O_TO_C_STR)"," AR_C $(@)") @@ -110,7 +110,7 @@ lib_dir = [ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib; # # Archive objects in .a file if needed # -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE ifeq ($(LIBABIVER),) @echo "Must Specify a $(LIB) ABI version" @@ -130,7 +130,7 @@ endif $(depfile_newer)),\ $(O_TO_S_DO)) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) $(if $(or \ $(file_missing),\ $(call cmdline_changed,$(O_TO_C_STR)),\ @@ -153,7 +153,7 @@ $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE $(depfile_missing),\ $(depfile_newer)),\ $(O_TO_A_DO)) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) $(if $(or \ $(file_missing),\ $(call cmdline_changed,$(O_TO_C_STR)),\ @@ -171,7 +171,7 @@ $(RTE_OUTPUT)/lib/$(LIB): $(LIB) @echo " INSTALL-LIB $(LIB)" @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) $(Q)ln -s -f $< $(RTE_OUTPUT)/lib/$(LIBSONAME) endif diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk index 352f738d1e..38ec7bd26b 100644 --- a/mk/rte.sdkbuild.mk +++ b/mk/rte.sdkbuild.mk @@ -93,7 +93,7 @@ $(ROOTDIRS-y): @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ @echo "== Build $@" $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all - @if [ $@ = drivers -a $(RTE_BUILD_COMBINE_LIBS) = y ]; then \ + @if [ $@ = drivers -a $(CONFIG_RTE_BUILD_COMBINE_LIBS) = y ]; then \ $(MAKE) -f $(RTE_SDK)/lib/Makefile sharelib; \ fi diff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk index de53558341..7bb72194b4 100644 --- a/mk/rte.sharelib.mk +++ b/mk/rte.sharelib.mk @@ -34,8 +34,8 @@ include $(RTE_SDK)/mk/internal/rte.build-pre.mk # VPATH contains at least SRCDIR VPATH += $(SRCDIR) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) LIB_ONE := lib$(RTE_LIBNAME).so else LIB_ONE := lib$(RTE_LIBNAME).a @@ -75,8 +75,8 @@ O_TO_A_DO = @set -e; \ # Archive objects to share library # -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) -ifeq ($(RTE_BUILD_SHARED_LIB),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) $(LIB_ONE): FORCE @[ -d $(dir $@) ] || mkdir -p $(dir $@) $(O_TO_S_DO) diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index d2f01b6499..0469064d33 100644 --- a/mk/rte.vars.mk +++ b/mk/rte.vars.mk @@ -63,14 +63,6 @@ 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:"%"=%) -- 2.20.1