ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Toplevel Makefile cleanup

Browse Source 
Change-Id: I2f4cb267dbb4d6e6fc6bef908c4bb548c5f37b35
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2017-01-15 21:30:50 +01:00
committed by Damjan Marion
parent cb365d89e5
commit 6484b3baa3
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -11,8 +11,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
WS_ROOT=$(CURDIR) export WS_ROOT=$(CURDIR)
BR=$(WS_ROOT)/build-root export BR=$(WS_ROOT)/build-root
CCACHE_DIR?=$(BR)/.ccache CCACHE_DIR?=$(BR)/.ccache
GDB?=gdb GDB?=gdb
PLATFORM?=vpp PLATFORM?=vpp
@ -202,18 +202,17 @@ wipe-release: $(BR)/.bootstrap.ok
rebuild-release: wipe-release build-release rebuild-release: wipe-release build-release
VPP_PYTHON_PREFIX=$(BR)/python export VPP_PYTHON_PREFIX=$(BR)/python
define test define test
$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
make -C test \ make -C test \
BR=$(BR) \
VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \ VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \ VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \ VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \ LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3) $(3)
endef endef
test: bootstrap test: bootstrap
@ -229,16 +228,16 @@ test-wipe:
@make -C test wipe @make -C test wipe
test-doc: test-doc:
@make -C test WS_ROOT=$(WS_ROOT) BR=$(BR) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) doc @make -C test doc
test-wipe-doc: test-wipe-doc:
@make -C test wipe-doc BR=$(BR) @make -C test wipe-doc
test-cov: bootstrap test-cov: bootstrap
$(call test,vpp_lite,vpp_lite_gcov,cov) $(call test,vpp_lite,vpp_lite_gcov,cov)
test-wipe-cov: test-wipe-cov:
@make -C test wipe-cov BR=$(BR) @make -C test wipe-cov
retest: retest:
$(call test,vpp_lite,vpp_lite,retest) $(call test,vpp_lite,vpp_lite,retest)
@ -316,7 +315,7 @@ fixstyle:
export DOXY_DIR ?= $(WS_ROOT)/doxygen export DOXY_DIR ?= $(WS_ROOT)/doxygen
define make-doxy define make-doxy
@OS_ID="$(OS_ID)" WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@ @OS_ID="$(OS_ID)" make -C $(DOXY_DIR) $@
endef endef
.PHONY: bootstrap-doxygen doxygen wipe-doxygen .PHONY: bootstrap-doxygen doxygen wipe-doxygen