[FE training-materials-updates] Make chapter definition work with splitted chapters
maxime.ripard at free-electrons.com
maxime.ripard at free-electrons.com
Thu May 10 13:40:59 CEST 2012
- Log -----------------------------------------------------------------
http://git.free-electrons.com/training-materials/commit/?id=2fa8fdbe1cb4bdaaf447946ea782f616750984d9
commit 2fa8fdbe1cb4bdaaf447946ea782f616750984d9
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date: Fri May 4 16:08:56 2012 +0200
Make chapter definition work with splitted chapters
Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
diff --git a/Makefile b/Makefile
index 7060609..7176c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ PDFLATEX = pdflatex
DIA = dia
EPSTOPDF = epstopdf
+# Needed macros
+UPPERCASE = $(shell echo $1 | tr "[:lower:]" "[:upper:]")
+
# List of slides for the different courses
SYSDEV_SLIDES = sysdev-intro \
sysdev-dev-environment \
@@ -130,21 +133,16 @@ default: help
ifdef SLIDES
# Compute the set of chapters to build depending on the name of the
# PDF file that was requested.
-ifeq ($(SLIDES),full-kernel)
-SLIDES_COMMON_BEFORE = common/slide-header.tex common/kernel-title.tex
-SLIDES_CHAPTERS = $(KERNEL_SLIDES)
-SLIDES_COMMON_AFTER = common/slide-footer.tex
-else ifeq ($(SLIDES),full-sysdev)
-SLIDES_COMMON_BEFORE = common/slide-header.tex common/sysdev-title.tex
-SLIDES_CHAPTERS = $(SYSDEV_SLIDES)
-SLIDES_COMMON_AFTER = common/slide-footer.tex
-else ifeq ($(SLIDES),full-android)
-SLIDES_COMMON_BEFORE = common/slide-header.tex common/android-title.tex
-SLIDES_CHAPTERS = $(ANDROID_SLIDES)
+ifeq ($(firstword $(subst -, , $(SLIDES))),full)
+SLIDES_TRAINING = $(lastword $(subst -, , $(SLIDES)))
+SLIDES_COMMON_BEFORE = common/slide-header.tex \
+ common/$(SLIDES_TRAINING)-title.tex
+SLIDES_CHAPTERS = $($(call UPPERCASE, $(SLIDES_TRAINING))_SLIDES)
SLIDES_COMMON_AFTER = common/slide-footer.tex
else
+SLIDES_TRAINING = $(firstword $(subst -, , $(SLIDES)))
SLIDES_COMMON_BEFORE = common/slide-header.tex common/single-slide-title.tex
-SLIDES_CHAPTERS = $(SLIDES)
+SLIDES_CHAPTERS = $(filter $(SLIDES)%, $($(call UPPERCASE, $(SLIDES_TRAINING))_SLIDES))
SLIDES_COMMON_AFTER = common/slide-footer.tex
endif
-----------------------------------------------------------------------
Summary of changes:
Makefile | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
More information about the training-materials-updates
mailing list