diff options
author | Nils Wallménius <nils@rockbox.org> | 2008-02-13 16:40:57 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2008-02-13 16:40:57 +0000 |
commit | 22a5c60af32fee67bd6f55b6d42fdbf1710cdbd1 (patch) | |
tree | bd6b111507e450d7bc9562498a1bc30c435e8190 /manual | |
parent | d098f7a19b0ce260c8a73ed86c343fd86bb7299e (diff) | |
download | rockbox-22a5c60af32fee67bd6f55b6d42fdbf1710cdbd1.tar.gz rockbox-22a5c60af32fee67bd6f55b6d42fdbf1710cdbd1.zip |
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
Diffstat (limited to 'manual')
-rw-r--r-- | manual/Makefile | 15 | ||||
-rw-r--r-- | manual/platform/c200.tex | 1 | ||||
-rw-r--r-- | manual/platform/e200.tex | 1 | ||||
-rw-r--r-- | manual/platform/ondiofm.tex | 1 | ||||
-rw-r--r-- | manual/platform/ondiosp.tex | 1 | ||||
-rw-r--r-- | manual/preamble.tex | 1 |
6 files changed, 15 insertions, 5 deletions
diff --git a/manual/Makefile b/manual/Makefile index 05df9ba5f0..52f6bd58c1 100644 --- a/manual/Makefile +++ b/manual/Makefile | |||
@@ -7,12 +7,17 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | # Needed to build the features list. | ||
11 | INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR) \ | ||
12 | -I$(BUILDDIR)/bitmaps -I$(OBJDIR) | ||
10 | 13 | ||
11 | .PHONY: all buildmanual clean | 14 | .PHONY: all buildmanual clean |
12 | MANFILE := rockbox-build | 15 | MANFILE := rockbox-build |
13 | 16 | ||
14 | all: manual-pdf | 17 | all: manual-pdf |
15 | 18 | ||
19 | features: $(OBJDIR)/features | ||
20 | |||
16 | manual-prep: rockbox.tex | 21 | manual-prep: rockbox.tex |
17 | @if [ "$(OBJDIR)" = "" ]; then echo Run make in you build directory!; false; fi | 22 | @if [ "$(OBJDIR)" = "" ]; then echo Run make in you build directory!; false; fi |
18 | @mkdir -p $(OBJDIR) | 23 | @mkdir -p $(OBJDIR) |
@@ -25,7 +30,15 @@ manual-prep: rockbox.tex | |||
25 | @printf "\\\\input{rockbox.tex}\n" >> $(OBJDIR)/$(MANFILE).tex | 30 | @printf "\\\\input{rockbox.tex}\n" >> $(OBJDIR)/$(MANFILE).tex |
26 | @mv $(OBJDIR)/Makefile.pdflatex $(OBJDIR)/Makefile | 31 | @mv $(OBJDIR)/Makefile.pdflatex $(OBJDIR)/Makefile |
27 | 32 | ||
28 | manual-pdf: manual-prep rockbox.tex | 33 | $(OBJDIR)/features: $(ROOTDIR)/apps/features.txt |
34 | $(SILENT)mkdir -p `dirname $@` | ||
35 | $(SILENT)cat $< | $(HOSTCC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ | ||
36 | $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \ | ||
37 | grep -v "^\#" | grep -v "^$$" > $@; \ | ||
38 | for f in `cat $(OBJDIR)/features`; do feat="$$feat\n\\\edef\\UseOption{\\UseOption,$$f}" ; done ; \ | ||
39 | echo -e "$$feat" >$(OBJDIR)/features.tex | ||
40 | |||
41 | manual-pdf: features manual-prep rockbox.tex | ||
29 | $(MAKE) -C $(OBJDIR) buildmanual | 42 | $(MAKE) -C $(OBJDIR) buildmanual |
30 | 43 | ||
31 | manual-html: manual-prep rockbox.tex | 44 | 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 @@ | |||
13 | \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} | 13 | \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} |
14 | \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} | 14 | \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} |
15 | \edef\UseOption{\UseOption,HAVE_RECORDING} | 15 | \edef\UseOption{\UseOption,HAVE_RECORDING} |
16 | \edef\UseOption{\UseOption,multivolume} | ||
17 | \edef\UseOption{\UseOption,sansa} | 16 | \edef\UseOption{\UseOption,sansa} |
18 | 17 | ||
19 | \newcommand{\playerman}{Sansa} | 18 | \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 @@ | |||
15 | \edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS} | 15 | \edef\UseOption{\UseOption,HAVE_BACKLIGHT_BRIGHTNESS} |
16 | \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} | 16 | \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} |
17 | \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} | 17 | \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} |
18 | \edef\UseOption{\UseOption,multivolume} | ||
19 | \edef\UseOption{\UseOption,sansa} | 18 | \edef\UseOption{\UseOption,sansa} |
20 | 19 | ||
21 | \newcommand{\playerman}{Sansa} | 20 | \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 @@ | |||
11 | \edef\UseOption{\UseOption,MASCODEC} | 11 | \edef\UseOption{\UseOption,MASCODEC} |
12 | \edef\UseOption{\UseOption,ONDIO_PAD} | 12 | \edef\UseOption{\UseOption,ONDIO_PAD} |
13 | \edef\UseOption{\UseOption,BATTERY_TYPES} | 13 | \edef\UseOption{\UseOption,BATTERY_TYPES} |
14 | \edef\UseOption{\UseOption,multivolume} | ||
15 | \edef\UseOption{\UseOption,archos} | 14 | \edef\UseOption{\UseOption,archos} |
16 | 15 | ||
17 | \newcommand{\playerman}{Archos} | 16 | \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 @@ | |||
8 | \edef\UseOption{\UseOption,MASCODEC} | 8 | \edef\UseOption{\UseOption,MASCODEC} |
9 | \edef\UseOption{\UseOption,ONDIO_PAD} | 9 | \edef\UseOption{\UseOption,ONDIO_PAD} |
10 | \edef\UseOption{\UseOption,BATTERY_TYPES} | 10 | \edef\UseOption{\UseOption,BATTERY_TYPES} |
11 | \edef\UseOption{\UseOption,multivolume} | ||
12 | \edef\UseOption{\UseOption,archos} | 11 | \edef\UseOption{\UseOption,archos} |
13 | 12 | ||
14 | \newcommand{\playerman}{Archos} | 13 | \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 @@ | |||
35 | \usepackage{optional} | 35 | \usepackage{optional} |
36 | 36 | ||
37 | \input{platform/\platform.tex} | 37 | \input{platform/\platform.tex} |
38 | \input{features.tex} | ||
38 | 39 | ||
39 | \newcommand{\playername}{\playerman\ \playerlongtype} | 40 | \newcommand{\playername}{\playerman\ \playerlongtype} |
40 | 41 | ||