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 | openembedded-core-contrib-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) XSLTOPTS = --xinclude ALLPREQ = html pdf eclipse tarball TARFILES = ref-manual.html ref-style.css figures/poky-title.png \ - figures/buildhistory.png figures/buildhistory-web.png eclipse + figures/buildhistory.png figures/buildhistory-web.png eclipse MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse FIGURES = figures STYLESHEET = $(DOC)/*.css @@ -245,8 +245,9 @@ TARFILES = profile-manual.html profile-manual.pdf profile-manual-style.css \ figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png figures/pybootchartgui-linux-yocto.png \ figures/pychart-linux-yocto-rpm.png figures/pychart-linux-yocto-rpm-nostrip.png \ figures/sched-wakeup-profile.png figures/sysprof-callers.png \ - figures/sysprof-copy-from-user.png figures/sysprof-copy-to-user.png -MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf + figures/sysprof-copy-from-user.png figures/sysprof-copy-to-user.png \ + eclipse +MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse FIGURES = figures STYLESHEET = $(DOC)/*.css endif |