From 2802b62a752a5997c91f8b44a07989980920f390 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 19 Mar 2015 17:35:12 +0100 Subject: [PATCH] doc: fix prefix in file references There are some references to DPDK.xyz.mk files that do not exist in the dpdk tree. This was probably the result of an automatic replacement, so restore the proper file names which are rte.xyz.mk. Signed-off-by: Olivier Matz --- doc/guides/prog_guide/build_app.rst | 8 ++++---- doc/guides/prog_guide/dev_kit_build_system.rst | 10 +++++----- doc/guides/prog_guide/ext_app_lib_make_help.rst | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst index d28d73508c..d4a3261520 100644 --- a/doc/guides/prog_guide/build_app.rst +++ b/doc/guides/prog_guide/build_app.rst @@ -82,9 +82,9 @@ Application Makefile The default makefile provided with the Hello World sample application is a good starting point. It includes: -* $(RTE_SDK)/mk/DPDK.vars.mk at the beginning +* $(RTE_SDK)/mk/rte.vars.mk at the beginning -* $(RTE_SDK)/mk/DPDK.extapp.mk at the end +* $(RTE_SDK)/mk/rte.extapp.mk at the end The user must define several variables: @@ -97,9 +97,9 @@ Library Makefile It is also possible to build a library in the same way: -* Include $(RTE_SDK)/mk/DPDK.vars.mk at the beginning. +* Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. -* Include $(RTE_SDK)/mk/DPDK.extlib.mk at the end. +* Include $(RTE_SDK)/mk/rte.extlib.mk at the end. The only difference is that APP should be replaced by LIB, which contains the name of the library. For example, libfoo.a. diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 23944f42da..cf5c96fb32 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -194,7 +194,7 @@ To compile an application, the user must set the RTE_SDK and RTE_TARGET environm cd /path/to/my_app For a new application, the user must create their own Makefile that includes some .mk files, such as -${RTE_SDK}/mk/DPDK.vars.mk, and ${RTE_SDK}/mk/ DPDK.app.mk. +${RTE_SDK}/mk/rte.vars.mk, and ${RTE_SDK}/mk/ rte.app.mk. This is described in :ref:`Building Your Own Application `. @@ -217,11 +217,11 @@ General Rules For DPDK Makefiles In the DPDK, Makefiles always follow the same scheme: -#. Include $(RTE_SDK)/mk/DPDK.vars.mk at the beginning. +#. Include $(RTE_SDK)/mk/rte.vars.mk at the beginning. #. Define specific variables for RTE build system. -#. Include a specific $(RTE_SDK)/mk/DPDK.XYZ.mk, where XYZ can be app, lib, extapp, extlib, obj, gnuconfigure, +#. Include a specific $(RTE_SDK)/mk/rte.XYZ.mk, where XYZ can be app, lib, extapp, extlib, obj, gnuconfigure, and so on, depending on what kind of object you want to build. :ref:`See Makefile Types ` below. @@ -231,7 +231,7 @@ In the DPDK, Makefiles always follow the same scheme: .. code-block:: make - include $(RTE_SDK)/mk/DPDK.vars.mk + include $(RTE_SDK)/mk/rte.vars.mk # binary name APP = helloworld @@ -242,7 +242,7 @@ In the DPDK, Makefiles always follow the same scheme: CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) - include $(RTE_SDK)/mk/DPDK.extapp.mk + include $(RTE_SDK)/mk/rte.extapp.mk .. _Makefile_Types: diff --git a/doc/guides/prog_guide/ext_app_lib_make_help.rst b/doc/guides/prog_guide/ext_app_lib_make_help.rst index bc5e23883c..c69e62cfff 100644 --- a/doc/guides/prog_guide/ext_app_lib_make_help.rst +++ b/doc/guides/prog_guide/ext_app_lib_make_help.rst @@ -36,11 +36,11 @@ External Application/Library Makefile help External applications or libraries should include specific Makefiles from RTE_SDK, located in mk directory. These Makefiles are: -* ${RTE_SDK}/mk/DPDK.extapp.mk: Build an application +* ${RTE_SDK}/mk/rte.extapp.mk: Build an application -* ${RTE_SDK}/mk/DPDK.extlib.mk: Build a static library +* ${RTE_SDK}/mk/rte.extlib.mk: Build a static library -* ${RTE_SDK}/mk/DPDK.extobj.mk: Build objects (.o) +* ${RTE_SDK}/mk/rte.extobj.mk: Build objects (.o) Prerequisites ------------- -- 2.20.1