From 65b112302c88accf18ad240be1dd7e26f412113a Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Mon, 31 Aug 2015 14:14:37 +0200
Subject: [PATCH] Frame rate adjustment
---
Doc/Makefile | 7 +++++--
Makefile | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Doc/Makefile b/Doc/Makefile
index a83dc1b65..cfe73962e 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 61d9ad00e..47bd1bdac 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
--
GitLab