4 files changed, 12 insertions, 12 deletions

diff --git a/tools/functions.make b/tools/functions.make
index b16bce3088..6748962d6a 100644
--- a/tools/functions.make
+++ b/tools/functions.make
@@ -32,9 +32,9 @@ c2obj = $(addsuffix .o,$(basename $(subst $(ROOTDIR),$(BUILDDIR),$(1))))
 mkdepfile = $(shell \
         $(CC) $(PPCFLAGS) $(OTHER_INC) -MG -MM -include config.h $(2) | \
         $(TOOLSDIR)/addtargetdir.pl $(ROOTDIR) $(BUILDDIR) | \
-        sed -e "s: lang.h: $(BUILDDIR)/lang.o:" \
+        sed -e "s: lang.h: $(BUILDDIR)/lang/lang_core.o:" \
         -e "s: sysfont.h: $(BUILDDIR)/sysfont.h:" \
-        -e "s: max_language_size.h: $(BUILDDIR)/max_language_size.h:" \
+        -e "s: max_language_size.h: $(BUILDDIR)/lang/max_language_size.h:" \
         -e "s: bitmaps/: $(BUILDDIR)/bitmaps/:g" \
         -e "s: pluginbitmaps/: $(BUILDDIR)/pluginbitmaps/:g" \
         -e "s: lib/: $(APPSDIR)/plugins/lib/:g" \
diff --git a/tools/genlang b/tools/genlang
index 9f9e904312..05183b8d67 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -535,13 +535,13 @@ if ($sortfile) {
 if($prefix) {
     # We create a .c and .h file
 
-    open(HFILE, ">$prefix.h") ||
-        die "Error: couldn't create file $prefix.h\n";
-    open(CFILE, ">$prefix.c") ||
-        die "Error: couldn't create file $prefix.c\n";        
+    open(HFILE, ">$prefix/lang.h") ||
+        die "Error: couldn't create file $prefix/lang.h\n";
+    open(CFILE, ">$prefix/lang_core.c") ||
+        die "Error: couldn't create file $prefix/lang_core.c\n";        
 
    # get header file name
-   $headername = "$prefix.h";
+   $headername = "$prefix/lang.h";
    $headername =~ s/(.*\/)*//;
 
     print HFILE <<MOO
diff --git a/tools/make.inc b/tools/make.inc
index 7d97efdbc6..601b892bfc 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -17,7 +17,7 @@ $(OBJDIR)/%.o: %.S
 # errors/warnings to cause an error code to get returned and thus stop the
 # build
 #
-# This script checks for the presence of $(BUILDDIR)/lang.h and if it doesn't
+# This script checks for the presence of $(BUILDDIR)/lang/lang.h and if it doesn't
 # alreay exist, it is created. This is because lots of files include this
 # *generated* file and if it doesn't exist when we generate the deps it is no
 # good. There's a -MG compiler option to cover for this case, but it doesn't
@@ -45,7 +45,7 @@ $(DEPFILE): $(SOURCES)
                 rm $$del; \
                 del=""; \
             fi \
-        done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" \
+        done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang/lang_core.o:" \
         -e "s:[^[:space:]]*sysfont.h:$(BUILDDIR)/sysfont.h:" \
         -e "s:[^[:space:]]*max_language_size.h:$(BUILDDIR)/max_language_size.h:" \
         -e "s: bitmaps/: $(BUILDDIR)/bitmaps/:g" \
diff --git a/tools/root.make b/tools/root.make
index af098c0610..9dc2937439 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -13,7 +13,7 @@ DEFINES = -DROCKBOX -DMEMORYSIZE=$(MEMORYSIZE) -DMEM=$(MEMORYSIZE) $(TARGET) \
         -DTARGET_ID=$(TARGET_ID) -DTARGET_NAME=\"$(MODELNAME)\" \
         -DAPPSVERSION=\"$(VERSION)\" $(BUILDDATE) \
         $(EXTRA_DEFINES) # <-- -DSIMULATOR or not
-INCLUDES = -I$(BUILDDIR) $(TARGET_INC)
+INCLUDES = -I$(BUILDDIR) -I$(BUILDDIR)/lang $(TARGET_INC)
 
 CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) 
 PPCFLAGS = $(filter-out -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix
@@ -97,11 +97,11 @@ veryclean: clean
 clean:
         $(SILENT)echo Cleaning build directory
         $(SILENT)rm -rf rockbox.zip rockbox.7z rockbox.tar rockbox.tar.gz \
-                rockbox.tar.bz2 TAGS apps firmware comsim sim lang.[ch] \
+                rockbox.tar.bz2 TAGS apps firmware comsim sim lang \
                 manual *.pdf *.a credits.raw rockbox.ipod bitmaps \
                 pluginbitmaps UI256.bmp rockbox-full.zip html txt \
                 rockbox-manual*.zip sysfont.h rockbox-info.txt voicefontids \
-                *.wav *.mp3 *.voice max_language_size.h $(CLEANOBJS) \
+                *.wav *.mp3 *.voice $(CLEANOBJS) \
                 $(LINKRAM) $(LINKROM) rockbox.elf rockbox.map rockbox.bin \
                 make.dep rombox.elf rombox.map rombox.bin rombox.ucl romstart.txt \
                 $(BINARY) $(FLASHFILE) uisimulator bootloader flash $(BOOTLINK)