GPH: Move all dist files into own folder under dists.

* Update vairous GPH bundle targets to suit new layout.
* Also add .in input files so we can automatically update version numbers.

20 files changed, 97 insertions, 30 deletions

diff --git a/backends/platform/gph/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
index 8aabca9028..2cf8e62b37 100755
--- a/backends/platform/gph/caanoo-bundle.mk
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -14,11 +14,11 @@ caanoo-bundle: $(EXECUTABLE)
 
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gph/devices/caanoo/scummvm.gpe $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
+	$(CP) $(srcdir)/dists/gph/caanoo/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/README-GPH $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.ini $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -45,11 +45,11 @@ caanoo-bundle-debug: $(EXECUTABLE)
 
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gph/devices/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
+	$(CP) $(srcdir)/dists/gph/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/dists/gph/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/README-GPH $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.ini $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
index 810ff8b8f0..adac489a6b 100644
--- a/backends/platform/gph/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -12,10 +12,10 @@ gp2x-bundle: $(EXECUTABLE)
 
 	echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gph/devices/gp2x/scummvm.gpe $(bundle_name)/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/
-	$(CP) $(srcdir)/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o $(bundle_name)/
+	$(CP) $(srcdir)/dists/gph/gp2x/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/README-GPH $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/gp2x/mmuhack/mmuhack.o $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
@@ -42,10 +42,10 @@ gp2x-bundle-debug: $(EXECUTABLE)
 
 	echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gph/devices/gp2x/scummvm.gpe $(bundle_name)/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/
-	$(CP) $(srcdir)/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o $(bundle_name)/
+	$(CP) $(srcdir)/dists/gph/gp2x/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/README-GPH $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/gp2x/mmuhack/mmuhack.o $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
diff --git a/backends/platform/gph/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index 65e2952fde..4f49850813 100755
--- a/backends/platform/gph/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -13,11 +13,11 @@ gp2xwiz-bundle: $(EXECUTABLE)
 
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gph/devices/gp2xwiz/scummvm.gpe $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
+	$(CP) $(srcdir)/dists/gph/gp2xwiz/scummvm.gpe $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/README-GPH $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.ini $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -47,11 +47,11 @@ gp2xwiz-bundle-debug: $(EXECUTABLE)
 
 	echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
-	$(CP) $(srcdir)/backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
+	$(CP) $(srcdir)/dists/gph/gp2xwiz/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+	$(CP) $(srcdir)/dists/gph/scummvm.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvmb.png $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/README-GPH $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/dists/gph/scummvm.ini $(bundle_name)/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
diff --git a/backends/platform/gph/devices/common/README-GPH b/dists/gph/README-GPH
index ea196f6649..29f0175306 100644
--- a/backends/platform/gph/devices/common/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,5 @@
-ScummVM - GPH DEVICE SPECIFIC README
+ScummVM 1.5.0git - GPH DEVICE SPECIFIC README
+
 ------------------------------------------------------------------------
 
 Contents:
diff --git a/dists/gph/README-GPH.in b/dists/gph/README-GPH.in
new file mode 100644
index 0000000000..31ec3e4041
--- /dev/null
+++ b/dists/gph/README-GPH.in
@@ -0,0 +1,61 @@
+ScummVM @VERSION@ - GPH DEVICE SPECIFIC README
+
+------------------------------------------------------------------------
+
+Contents:
+
+    * About the backend/port <#About_the_backendport>
+    * Supported audio options <#Supported_audio_options>
+    * Credits <#Credits>
+
+------------------------------------------------------------------------
+
+Please refer to the:
+
+GPH ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14>
+
+WiKi: (Select your device)
+
+<http://wiki.scummvm.org/index.php/GP2X>
+<http://wiki.scummvm.org/index.php/GP2XWiz>
+<http://wiki.scummvm.org/index.php/Caanoo>
+
+for the most current information on the port and any updates to this
+documentation.
+
+The wiki includes detailed instructions on how to use the port and 
+control information.
+
+------------------------------------------------------------------------
+About the backend/port
+
+This is the readme for the official GPH ScummVM backend (also known as
+the GP2X port/GP2XWiz port or Caanoo port).
+
+This is an SVN test release of ScummVM for GPH devices, it would be
+appreciated if this SVN test distribution was not mirrored and that
+people be directed to http://scummvm.distant-earth.com/ instead for
+updated SVN builds.
+
+Fully supported official releases of the GPH ScummVM backend are made in
+line with main official releases and are avalalble from the ScummVM
+downloads page <http://www.scummvm.org/downloads.php> for the GP2X, 
+GP2XWiz and Caanoo.
+
+------------------------------------------------------------------------
+Supported audio options
+
+Raw audio.
+MP3 audio.
+OGG Vorbis audio.
+
+FLAC audio is currently unsupported.
+
+For best results use uncompressed audio in games.
+
+------------------------------------------------------------------------
+Credits
+
+Core ScummVM code (c) The ScummVM Team
+Portions of the GPH backend (c) John Willis
+Detailed (c) information can be found within the source code
diff --git a/backends/platform/gph/devices/caanoo/scummvm-gdb.gpe b/dists/gph/caanoo/scummvm-gdb.gpe
index 63ce193ca8..63ce193ca8 100644
--- a/backends/platform/gph/devices/caanoo/scummvm-gdb.gpe
+++ b/dists/gph/caanoo/scummvm-gdb.gpe
diff --git a/backends/platform/gph/devices/caanoo/scummvm.gpe b/dists/gph/caanoo/scummvm.gpe
index 37d0f65d18..37d0f65d18 100644
--- a/backends/platform/gph/devices/caanoo/scummvm.gpe
+++ b/dists/gph/caanoo/scummvm.gpe
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/Makefile b/dists/gph/gp2x/mmuhack/Makefile
index a35d5c2a98..a35d5c2a98 100644
--- a/backends/platform/gph/devices/gp2x/mmuhack/Makefile
+++ b/dists/gph/gp2x/mmuhack/Makefile
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/README b/dists/gph/gp2x/mmuhack/README
index 6db7d81845..6db7d81845 100644
--- a/backends/platform/gph/devices/gp2x/mmuhack/README
+++ b/dists/gph/gp2x/mmuhack/README
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.h b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.h
index d01548e474..d01548e474 100644
--- a/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.h
+++ b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.h
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.s b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.s
index 265908e1fd..265908e1fd 100644
--- a/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.s
+++ b/dists/gph/gp2x/mmuhack/flush_uppermem_cache.s
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.c b/dists/gph/gp2x/mmuhack/mmuhack.c
index 2e38bdb284..2e38bdb284 100644
--- a/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.c
+++ b/dists/gph/gp2x/mmuhack/mmuhack.c
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o b/dists/gph/gp2x/mmuhack/mmuhack.o
index 475f4a54ae..475f4a54ae 100644
--- a/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o
+++ b/dists/gph/gp2x/mmuhack/mmuhack.o
diff --git a/backends/platform/gph/devices/gp2x/scummvm.gpe b/dists/gph/gp2x/scummvm.gpe
index 51a49f7560..51a49f7560 100644
--- a/backends/platform/gph/devices/gp2x/scummvm.gpe
+++ b/dists/gph/gp2x/scummvm.gpe
diff --git a/backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe b/dists/gph/gp2xwiz/scummvm-gdb.gpe
index 63ce193ca8..63ce193ca8 100644
--- a/backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe
+++ b/dists/gph/gp2xwiz/scummvm-gdb.gpe
diff --git a/backends/platform/gph/devices/gp2xwiz/scummvm.gpe b/dists/gph/gp2xwiz/scummvm.gpe
index 59ff562aeb..59ff562aeb 100644
--- a/backends/platform/gph/devices/gp2xwiz/scummvm.gpe
+++ b/dists/gph/gp2xwiz/scummvm.gpe
diff --git a/backends/platform/gph/devices/common/scummvm.ini b/dists/gph/scummvm.ini
index c9cce92379..952cd0de24 100644
--- a/backends/platform/gph/devices/common/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
 [info]
-name="ScummVM"
+name="ScummVM 1.5.0git"
 path="/scummvm/scummvm.gpe"
 icon="/scummvm/scummvm.png"
 title="/scummvm/scummvmb.png"
diff --git a/dists/gph/scummvm.ini.in b/dists/gph/scummvm.ini.in
new file mode 100644
index 0000000000..1c80d97d8b
--- /dev/null
+++ b/dists/gph/scummvm.ini.in
@@ -0,0 +1,5 @@
+[info]
+name="ScummVM @VERSION@"
+path="/scummvm/scummvm.gpe"
+icon="/scummvm/scummvm.png"
+title="/scummvm/scummvmb.png"
diff --git a/backends/platform/gph/devices/common/scummvm.png b/dists/gph/scummvm.png
index 128e59efc4..128e59efc4 100644
--- a/backends/platform/gph/devices/common/scummvm.png
+++ b/dists/gph/scummvm.png
diff --git a/backends/platform/gph/devices/common/scummvmb.png b/dists/gph/scummvmb.png
index 24a27bc0e1..24a27bc0e1 100644
--- a/backends/platform/gph/devices/common/scummvmb.png
+++ b/dists/gph/scummvmb.png