diff --git a/Doc/Makefile b/Doc/Makefile index a83dc1b658effb70f4c0d257c1d4abd447c88e3e..cfe73962eee40dc1de58a0ad71684f0dfcc4d492 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -43,12 +43,12 @@ JAVADOCDESTDIR=${BUILDNAVI}/Ref/api #Video webm-->mp4 conversion rule # %.webm.mp4:%.webm - avconv -i $< -acodec libx264 -c:a libvorbis $<.mp4 || rm -f $<.mp4 + avconv -i $< -acodec libx264 -b:v 256k -c:a libvorbis $<.mp4 || rm -f $<.mp4 webmSet = $(shell /bin/ls target/*/Ref/Video/*.webm) mp4Set = $(foreach webmFile, $(webmSet), $(webmFile).mp4 ) -all: ${BUILDROOT}/${BUILDNAVI}/printversion.pdf ${BUILDROOT}/${BUILDNAVI}/index.html ${BUILDROOT}/${BUILDNONAVI}/index.html $(mp4Set) +all: ${BUILDROOT}/stage1 $(mp4Set) cd ${BUILDROOT}/resources/Generate;\ for module in ${DOCMODULES}; do \ pushd $$module;\ @@ -64,6 +64,9 @@ all: ${BUILDROOT}/${BUILDNAVI}/printversion.pdf ${BUILDROOT}/${BUILDNAVI}/index. done; cd ${BUILDROOT}; tar c- ${DOCMODULES} | tar -x -C ${BUILDNAVI} +${BUILDROOT}/stage1: ${BUILDROOT}/${BUILDNAVI}/printversion.pdf ${BUILDROOT}/${BUILDNAVI}/index.html ${BUILDROOT}/${BUILDNONAVI}/index.html + touch ${BUILDROOT}/stage1 + ${BUILDROOT}/${BUILDNAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml cd ${BUILDROOT}; mkdir -p ${BUILDNAVI};\ /usr/share/xmlmind.goik/bin/xxetool convert -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp \ diff --git a/Makefile b/Makefile index 61d9ad00e07d30bd18ced6e9a2add46a153bf864..47bd1bdacc6f687d27f53625d675773b96c8106d 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ numCores=$(shell nproc --all) DOCMODULES = Sd1 Sda1 Sda2 doc: + cd Doc;$(MAKE) -j ${numCores} target/stage1 cd Doc;$(MAKE) -j ${numCores} all all:doc