4 files changed, 39 insertions, 13 deletions

diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 4faa38ac54..4c21ae819f 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -154,6 +154,30 @@ sub filesize {
     return $size;
 }
 
+sub buildlangs {
+    my ($outputlang)=@_;
+    my $dir = "$ROOT/apps/lang";
+    opendir(DIR, $dir);
+    my @files = grep { /\.lang$/ } readdir(DIR);
+    closedir(DIR);
+
+    # Exclude some bad languages (uncomment and adjust in case of release
+    # and/or End Times)
+    # @files = grep(!/(afrikaans|hindi|slovenscina|turkce)\.lang/, @files);
+
+    # Exclude more languages on the player which won't work on charcell display
+    if ($archos =~ /^"?player:/ ) {
+        @files = grep(!/(chinese-simp|chinese-trad|hindi|japanese|korean|thai)\.lang/, @files);
+    }
+
+    for(@files) {
+        my $output = $_;
+        $output =~ s/(.*)\.lang/$1.lng/;
+        print "$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_\n" if($verbose);
+        system ("$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_ >/dev/null 2>&1");
+    }
+}
+
 sub buildzip {
     my ($zip, $image, $fonts)=@_;
 
@@ -389,8 +413,15 @@ STOP
     # and the info file
     system("cp rockbox-info.txt .rockbox/");
 
-    # copy the already built lng files
-    `cp apps/lang/*lng .rockbox/langs/`
+    # now copy the file made for reading on the unit:
+    #if($notplayer) {
+    #    `cp $webroot/docs/Help-JBR.txt .rockbox/docs/`;
+    #}
+    #else {
+    #    `cp $webroot/docs/Help-Stu.txt .rockbox/docs/`;
+    #}
+
+    buildlangs(".rockbox/langs");
 
 }
 
diff --git a/tools/configure b/tools/configure
index b46f175f6a..49773e1a6f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1919,14 +1919,14 @@ export ENCODER=@ENCODER@
 # Do not print "Entering directory ..."
 MAKEFLAGS += --no-print-directory
 
-.PHONY: all clean tags zip tools manual bin build info langs
+.PHONY: all clean tags zip tools manual bin build info
 
 all: info
 
 info: build
         \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt
 
-build: tools langs
+build: tools
         @SIMUL1@
         @SIMUL2@
         \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
@@ -1952,7 +1952,7 @@ clean:
                   manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
                   @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
                   html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
-                  voicefontids *.wav *.mp3 *.voice max_language_size.h
+                  voicefontids *.wav *.mp3 *.voice
 
 tools:
         \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @TOOLSET@
@@ -1996,10 +1996,6 @@ bzip2: tar
 gzip: tar
         \$(SILENT)gzip -f9 rockbox.tar
 
-langs: features
-        \$(SILENT)mkdir -p \$(BUILDDIR)/apps/lang
-        \$(SILENT)\$(MAKE) -C \$(APPSDIR)/lang OBJDIR=\$(BUILDDIR)/apps/lang
-
 manual: manual-pdf
 manual-pdf:
         \$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-pdf
diff --git a/tools/make.inc b/tools/make.inc
index 30d0779b2d..8e125c834e 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -40,8 +40,7 @@ $(DEPFILE): $(SOURCES)
                 rm $$del; \
                 del=""; \
             fi \
-        done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" \
-        -e "s:[^[:space:]]*sysfont.h:$(BUILDDIR)/sysfont.h:" > $(DEPFILE); \
+        done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" > $(DEPFILE); \
         echo "oo" > /dev/null )
 
 tags:
diff --git a/tools/makesrc.inc b/tools/makesrc.inc
index 846df8cb9e..78d97f3283 100644
--- a/tools/makesrc.inc
+++ b/tools/makesrc.inc
@@ -10,5 +10,5 @@
 # to make this do right when used on Mac OS X.
 
 SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
-$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - 2>/dev/null \
-| grep -v "^\#")
+$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - | \
+grep -v "^\#")