Index: apps/Makefile
===================================================================
RCS file: /cvsroot/rockbox/apps/Makefile,v
retrieving revision 1.104
diff -u -r1.104 Makefile
--- apps/Makefile	24 Feb 2006 13:48:51 -0000	1.104
+++ apps/Makefile	29 Mar 2006 08:50:49 -0000
@@ -187,15 +187,10 @@
 
 include $(TOOLSDIR)/make.inc
 
-$(OBJDIR)/build.lang: lang/$(LANGUAGE).lang $(TOOLSDIR)/uplang
-	@echo "UPLANG"
-	@mkdir -p `dirname $@`
-	@perl $(TOOLSDIR)/uplang lang/english.lang $< > $@
-
-$(OBJDIR)/lang.o: $(OBJDIR)/build.lang $(TOOLSDIR)/genlang
+$(OBJDIR)/lang.o: lang/$(LANGUAGE).lang2 $(TOOLSDIR)/genlang
 	@echo "GENLANG"
 	@mkdir -p `dirname $@`
-	@perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang $<
+	$(SILENT)perl -s $(TOOLSDIR)/genlang2 -p=$(BUILDDIR)/lang -t=$(ARCHOS) $<
 	@echo "CC lang.c"
 	@$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@