summaryrefslogtreecommitdiffstats
path: root/documentation/Makefile
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-04-26 08:46:36 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-01 21:00:30 +0100
commitcaf6532b519cfbd715fee40ca79e68659e0ce5de (patch)
tree0c0c2af9b36fa2d2462f10af0f2703993135f0e5 /documentation/Makefile
parenta81cb954bb9e416557c2fddae8f09ddf4aef7959 (diff)
downloadpoky-caf6532b519cfbd715fee40ca79e68659e0ce5de.tar.gz
poky-caf6532b519cfbd715fee40ca79e68659e0ce5de.tar.bz2
poky-caf6532b519cfbd715fee40ca79e68659e0ce5de.zip
documentation: release-specific figure needed for denzil in dev-manual
dev-manual/dev-manual-model.xml: The Bare Clone and Copy of the Bare Clone figures are out of date for denzil. These needed to be re-done so they use "linux-yocto-3.2.git" and "my-linux-yocto-3.0-work" as the root names. This presents a Makefile issue when making the denzil and pre-denzil versions of the manuals. Whenever you use a different figure for a different release, you need to involve the BRANCH variable in the Makefile. This is necessary because you are using different figures in the generated tarballs. The set of figures could be unique to the release. The outdated figure is "kernel-overview-3.png" and will eventually be removed (later commit). I created a new figure named "kernel-overview-3-denzil.png" and used that in the dev-manual-model.xml file. documentation/Makefile: I updated the Makefile to test for a "denzil" release build and if so include the new file in the generated tarball. This commit adds the new .PNG file as well. Fixed the Makefile so that if you don't supply a BRANCH value, it uses the latest figures (denzil). (From yocto-docs rev: 49552b12a967f97eb4d75477895bf32f61d69aa6) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/Makefile')
-rw-r--r--documentation/Makefile16
1 files changed, 13 insertions, 3 deletions
diff --git a/documentation/Makefile b/documentation/Makefile
index 7cf1c6727e..3a12c0e0f8 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -82,7 +82,8 @@ ALLPREQ = html pdf tarball
#
# Note that the tarfile might produce the "Cannot stat: No such file or directory" error
# message for .PNG files that are not present when building a particular branch. The
-# list of files is all-inclusive for all branches.
+# list of files is all-inclusive for all branches. Note, if you don't provide a BRANCH
+# option, it defaults to the latest stuff. This would be appropriate for "master" branch.
#
ifeq ($(BRANCH),edison)
@@ -94,13 +95,22 @@ TARFILES = style.css dev-manual.html dev-manual.pdf \
figures/kernel-overview-3-edison.png \
figures/source-repos.png figures/yp-download.png \
figures/wip.png
- else
+ else ifeq ($(BRANCH),denzil)
TARFILES = style.css dev-manual.html dev-manual.pdf \
figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \
figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \
figures/kernel-example-repos.png \
figures/kernel-overview-1.png figures/kernel-overview-2.png \
- figures/kernel-overview-3.png \
+ figures/kernel-overview-3-denzil.png \
+ figures/source-repos.png figures/yp-download.png \
+ figures/wip.png
+ else
+TARFILES = style.css dev-manual.html dev-manual.pdf \
+ figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \
+ figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \
+ figures/kernel-example-repos.png \
+ figures/kernel-overview-1.png figures/kernel-overview-2.png \
+ figures/kernel-overview-3-denzil.png \
figures/source-repos.png figures/yp-download.png \
figures/wip.png
endif