summaryrefslogtreecommitdiffstats
path: root/documentation/Makefile
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 17:30:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 17:30:09 +0000
commit72fdc8ed09ca82008c57b7bc8a090d25332def37 (patch)
tree5c4cc901513587ae10a4de513d41e132fe0d55bb /documentation/Makefile
parente57f8627beda2c2b133b55135ce7aec814993592 (diff)
downloadpoky-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/Makefile7
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)
209XSLTOPTS = --xinclude 209XSLTOPTS = --xinclude
210ALLPREQ = html pdf eclipse tarball 210ALLPREQ = html pdf eclipse tarball
211TARFILES = ref-manual.html ref-style.css figures/poky-title.png \ 211TARFILES = 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
213MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse 213MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse
214FIGURES = figures 214FIGURES = figures
215STYLESHEET = $(DOC)/*.css 215STYLESHEET = $(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 \
249MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf 249 eclipse
250MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse
250FIGURES = figures 251FIGURES = figures
251STYLESHEET = $(DOC)/*.css 252STYLESHEET = $(DOC)/*.css
252endif 253endif