[PATCHv4,4/4] doc: fix make dist after git auto merge from odp

Message ID 1478004314-10516-5-git-send-email-balakrishna.garapati@linaro.org
State New
Headers show

Commit Message

Krishna Garapati Nov. 1, 2016, 12:45 p.m.
Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
---
 doc/platform-api-guide/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Elo, Matias (Nokia - FI/Espoo) Nov. 1, 2016, 1:52 p.m. | #1
> On 1 Nov 2016, at 14:45, Balakrishna Garapati <balakrishna.garapati@linaro.org> wrote:

> 

> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>

> ---

> doc/platform-api-guide/Makefile.am | 3 +--

> 1 file changed, 1 insertion(+), 2 deletions(-)

> 

> diff --git a/doc/platform-api-guide/Makefile.am b/doc/platform-api-guide/Makefile.am

> index 27cd902..d1b1b0d 100644

> --- a/doc/platform-api-guide/Makefile.am

> +++ b/doc/platform-api-guide/Makefile.am

> @@ -3,8 +3,7 @@

> #distribution.

> 

> EXTRA_DIST = \

> -	     Doxyfile \

> -	     $(top_srcdir)/platform/${with_platform}/doc/*.dox

> +	     Doxyfile

> 

> 


As this file is not specific to odp-dpdk modifying it will cause merge issues later on. I’d rather
fix the error by porting the original commit 'linux-gen: doc: defining the ODP thread’. Note that
at least as far as I know odp-dpdk doesn’t currently support multiple instances.

-Matias

Patch hide | download patch | download mbox

diff --git a/doc/platform-api-guide/Makefile.am b/doc/platform-api-guide/Makefile.am
index 27cd902..d1b1b0d 100644
--- a/doc/platform-api-guide/Makefile.am
+++ b/doc/platform-api-guide/Makefile.am
@@ -3,8 +3,7 @@ 
 #distribution.
 
 EXTRA_DIST = \
-	     Doxyfile \
-	     $(top_srcdir)/platform/${with_platform}/doc/*.dox
+	     Doxyfile
 
 
 clean-local: