10 files changed, 14 insertions, 31 deletions

diff --git a/manual/Makefile b/manual/Makefile
index cc30a744b3..43ba4a65a7 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -1,17 +1,10 @@
-.PHONY: all buildmanual clean
+DOCUMENT := rockbox-build
+LATEX := pdflatex
+include LaTeX.Rules
+GRAPHIC_FILES:=`find . -name \*.jpg \*.jpeg`
 
-all: rockbox-build.tex
+.PHONY: all cleaner buildmanual output
 
-rockbox-build.tex: rockbox.tex
-        @if [ "$(OBJDIR)" = "" ]; then echo Run make in you build diriectory!; false; fi
-        @mkdir -p $(OBJDIR)
-        @cp -R * $(OBJDIR)
-        @echo "\newcommand{\platform}{${ARCHOS}}" > $(OBJDIR)/rockbox-build.tex
-        @echo "\newcommand{\buildversion}{$(VERSION)}" >> $(OBJDIR)/rockbox-build.tex
-        @echo "\input{rockbox.tex}" >> $(OBJDIR)/rockbox-build.tex
-        @mv $(OBJDIR)/Makefile.pdflatex $(OBJDIR)/Makefile
-        make -C $(OBJDIR)
+buildmanual: rockbox-build.tex
+        @cp $(OBJDIR)/rockbox-build.pdf $(OBJDIR)/../rockbox-$(ARCHOS)-$(VERSION).pdf
 
-clean:
-        @if [ "$(OBJDIR)" == "" ]; then echo Run make in you build diriectory!; false; fi
-        @rm -rf $(OBJDIR)/manual $(OBJDIR)/*.pdf
diff --git a/manual/rockbox_interface/images/ss-file-browser-112x64x1.png b/manual/rockbox_interface/images/ss-file-browser-112x64x1.png
new file mode 100644
index 0000000000..eed028dc55
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-browser-112x64x1.png
diff --git a/manual/rockbox_interface/images/ss-file-browser-160x128x2.png b/manual/rockbox_interface/images/ss-file-browser-160x128x2.png
new file mode 100644
index 0000000000..d5f1ec0935
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-browser-160x128x2.png
diff --git a/manual/rockbox_interface/images/ss-file-browser-176x132x16.png b/manual/rockbox_interface/images/ss-file-browser-176x132x16.png
new file mode 100644
index 0000000000..e1e766f69c
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-browser-176x132x16.png
diff --git a/manual/rockbox_interface/images/ss-file-browser-220x176x16.png b/manual/rockbox_interface/images/ss-file-browser-220x176x16.png
new file mode 100644
index 0000000000..c0109c8224
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-browser-220x176x16.png
diff --git a/manual/rockbox_interface/images/ss-file-menu-112x64x1.png b/manual/rockbox_interface/images/ss-file-menu-112x64x1.png
new file mode 100644
index 0000000000..9e66421390
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-menu-112x64x1.png
diff --git a/manual/rockbox_interface/images/ss-file-menu-160x128x2.png b/manual/rockbox_interface/images/ss-file-menu-160x128x2.png
new file mode 100644
index 0000000000..f12b9704d0
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-menu-160x128x2.png
diff --git a/manual/rockbox_interface/images/ss-file-menu-176x132x16.png b/manual/rockbox_interface/images/ss-file-menu-176x132x16.png
new file mode 100644
index 0000000000..c9cdaec47c
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-menu-176x132x16.png
diff --git a/manual/rockbox_interface/images/ss-file-menu-220x176x16.png b/manual/rockbox_interface/images/ss-file-menu-220x176x16.png
new file mode 100644
index 0000000000..c59200389d
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-menu-220x176x16.png
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index f383e7c900..8d8cbe0bb6 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -21,7 +21,6 @@ for 2{}-3 seconds.  (Flashed Jukeboxes only require a tap of the ON key
 information about flashing Rockbox.) 
 \label{ref:Safeshutdown}On shutdown, Rockbox automatically saves its settings and turns off the hard drive safely. To tell Rockbox to shut the Jukebox down, do the following:
 
-
 \begin{table}[h!]
   \begin{center}
     \begin{tabular}{@{}lc@{}}\toprule
@@ -41,14 +40,10 @@ For further details about connecting, charging and caring for your
 Jukebox, please see the Archos manual that came with it.
 
 \section{\label{ref:PartIIFB}File Browser}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=4.15cm,height=2.35cm]{images/rockbox-manual-img11.png}
-     [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=4.15cm,height=1.981cm]{images/rockbox-manual-img12.png}
- \newline
-Recorder file browser  Player file browser  
-\par}
+\begin{center}
+  \includegraphics[width=4cm]{rockbox_interface/images/ss-file-browser-\genericimg.png}
+\end{center}
+
 The file browser helps you navigate through the files on your Jukebox,
 entering folders and executing the default action on each file. To help
 us differentiate files, each file format is displayed with an icon. You
@@ -117,14 +112,9 @@ can select which file types are displayed (see page
 
 
 \subsection{\label{ref:Filemenu}\label{ref:PartIISectionFM}File Menu}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=4.15cm,height=2.35cm]{images/rockbox-manual-img13.png}
-     [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=4.15cm,height=1.951cm]{images/rockbox-manual-img14.png}
- \newline
-Recorder file menu  Player file menu  
-\par}
+\begin{center}
+  \includegraphics[width=4cm]{rockbox_interface/images/ss-file-menu-\genericimg.png}
+\end{center}
 
 This menu operates on the file that was selected in the browser at the
 time ON+PLAY was pressed to enter it.  It can also be accessed by