Makefile: Resolving a conflict

(From yocto-docs rev: 221b8eeee23841395b6323da0893156346dead6f)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark 2016-03-15 11:31:37 -07:00 committed by Richard Purdie
parent af40e9a315
commit 32629e01d6
1 changed files with 3 additions and 1 deletions

View File

@ -247,7 +247,8 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \
figures/simple-configuration.png figures/devtool-add-flow.png \
figures/devtool-modify-flow.png figures/devtool-upgrade-flow.png \
figures/compatible-layers.png figures/import-layer.png figures/new-project.png \
figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png
figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \
figures/sdk-installed-extensible-sdk-directory.png
endif
MANUALS = $(DOC)/$(DOC).html
@ -290,6 +291,7 @@ XSLTOPTS = --xinclude
ALLPREQ = html eclipse tarball
TARFILES = sdk-manual.html sdk-style.css figures/sdk-title.png \
figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \
figures/sdk-installed-extensible-sdk-directory.png \
eclipse
MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse
FIGURES = figures