Commit FS#8567, the manual now uses the same 'features' system as the lang/voice creation does. Building the manual now requires gcc to parse the features list and 'make manual' must now be used instead of just 'make'. Rerun configure in your manual build dirs.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16304 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 15 insertions, 8 deletions

diff --git a/manual/Makefile b/manual/Makefile
index 05df9ba5f0..52f6bd58c1 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -7,12 +7,17 @@
 # $Id$
 #
 
+# Needed to build the features list.
+INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR)      \
+ -I$(BUILDDIR)/bitmaps -I$(OBJDIR)
 
 .PHONY: all buildmanual clean
 MANFILE := rockbox-build
 
 all: manual-pdf 
 
+features: $(OBJDIR)/features
+
 manual-prep: rockbox.tex
         @if [ "$(OBJDIR)" = "" ]; then echo Run make in you build directory!; false; fi
         @mkdir -p $(OBJDIR)
@@ -25,7 +30,15 @@ manual-prep: rockbox.tex
         @printf "\\\\input{rockbox.tex}\n" >> $(OBJDIR)/$(MANFILE).tex
         @mv $(OBJDIR)/Makefile.pdflatex $(OBJDIR)/Makefile
 
-manual-pdf: manual-prep rockbox.tex
+$(OBJDIR)/features: $(ROOTDIR)/apps/features.txt
+        $(SILENT)mkdir -p `dirname $@`
+        $(SILENT)cat $< | $(HOSTCC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
+        $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \
+        grep -v "^\#" | grep -v "^$$" > $@; \
+        for f in `cat $(OBJDIR)/features`; do feat="$$feat\n\\\edef\\UseOption{\\UseOption,$$f}" ; done ; \
+        echo -e "$$feat" >$(OBJDIR)/features.tex
+
+manual-pdf: features manual-prep rockbox.tex
         $(MAKE) -C $(OBJDIR) buildmanual
 
 manual-html: manual-prep rockbox.tex
diff --git a/manual/platform/c200.tex b/manual/platform/c200.tex
index fc5067ff73..c6ea23aeaf 100644
--- a/manual/platform/c200.tex
+++ b/manual/platform/c200.tex
@@ -13,7 +13,6 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
-\edef\UseOption{\UseOption,multivolume}
 \edef\UseOption{\UseOption,sansa}
 
 \newcommand{\playerman}{Sansa}
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index b472738e27..faaa87512a 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -15,7 +15,6 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
-\edef\UseOption{\UseOption,multivolume}
 \edef\UseOption{\UseOption,sansa}
 
 \newcommand{\playerman}{Sansa}
diff --git a/manual/platform/ondiofm.tex b/manual/platform/ondiofm.tex
index ab6c2d3312..64a72c90ea 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/ondiofm.tex
@@ -11,7 +11,6 @@
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,BATTERY_TYPES}
-\edef\UseOption{\UseOption,multivolume}
 \edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
diff --git a/manual/platform/ondiosp.tex b/manual/platform/ondiosp.tex
index 2894b676ae..c07cab2de0 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/ondiosp.tex
@@ -8,7 +8,6 @@
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,BATTERY_TYPES}
-\edef\UseOption{\UseOption,multivolume}
 \edef\UseOption{\UseOption,archos}
 
 \newcommand{\playerman}{Archos}
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 63e17659c1..3c89d1bf4a 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -35,6 +35,7 @@
 \usepackage{optional}
 
 \input{platform/\platform.tex}
+\input{features.tex}
 
 \newcommand{\playername}{\playerman\ \playerlongtype}
 
diff --git a/tools/configure b/tools/configure
index 949bea1a37..28f7813ec8 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1585,9 +1585,6 @@ fi
       echo "GDB stub build selected"
       ;;
     [Mm])
-      appsdir='\$(ROOTDIR)/manual'
-      firmdir='\$(ROOTDIR)/manual/platform' # No Makefile here.  Effectively ig:res target
-      toolsdir=$firmdir;
       toolset='';
       apps="manual"
       echo "Manual build selected"