diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-14 17:30:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-14 17:30:09 +0000 |
commit | 72fdc8ed09ca82008c57b7bc8a090d25332def37 (patch) | |
tree | 5c4cc901513587ae10a4de513d41e132fe0d55bb /documentation/Makefile | |
parent | e57f8627beda2c2b133b55135ce7aec814993592 (diff) | |
download | poky-72fdc8ed09ca82008c57b7bc8a090d25332def37.tar.gz |
yocto-docs: Fixup a couple of merge issues
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/Makefile')
-rw-r--r-- | documentation/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/documentation/Makefile b/documentation/Makefile index 5272ee58bd..c3c6a3c7e3 100644 --- a/documentation/Makefile +++ b/documentation/Makefile | |||
@@ -209,7 +209,7 @@ ifeq ($(DOC),ref-manual) | |||
209 | XSLTOPTS = --xinclude | 209 | XSLTOPTS = --xinclude |
210 | ALLPREQ = html pdf eclipse tarball | 210 | ALLPREQ = html pdf eclipse tarball |
211 | TARFILES = ref-manual.html ref-style.css figures/poky-title.png \ | 211 | TARFILES = ref-manual.html ref-style.css figures/poky-title.png \ |
212 | figures/buildhistory.png figures/buildhistory-web.png eclipse | 212 | figures/buildhistory.png figures/buildhistory-web.png eclipse |
213 | MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse | 213 | MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse |
214 | FIGURES = figures | 214 | FIGURES = figures |
215 | STYLESHEET = $(DOC)/*.css | 215 | STYLESHEET = $(DOC)/*.css |
@@ -245,8 +245,9 @@ TARFILES = profile-manual.html profile-manual.pdf profile-manual-style.css \ | |||
245 | figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png figures/pybootchartgui-linux-yocto.png \ | 245 | figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png figures/pybootchartgui-linux-yocto.png \ |
246 | figures/pychart-linux-yocto-rpm.png figures/pychart-linux-yocto-rpm-nostrip.png \ | 246 | figures/pychart-linux-yocto-rpm.png figures/pychart-linux-yocto-rpm-nostrip.png \ |
247 | figures/sched-wakeup-profile.png figures/sysprof-callers.png \ | 247 | figures/sched-wakeup-profile.png figures/sysprof-callers.png \ |
248 | figures/sysprof-copy-from-user.png figures/sysprof-copy-to-user.png | 248 | figures/sysprof-copy-from-user.png figures/sysprof-copy-to-user.png \ |
249 | MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf | 249 | eclipse |
250 | MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse | ||
250 | FIGURES = figures | 251 | FIGURES = figures |
251 | STYLESHEET = $(DOC)/*.css | 252 | STYLESHEET = $(DOC)/*.css |
252 | endif | 253 | endif |