diff -urN sdk2unix-1.9/data/gcc539/makerules.orig/dll sdk2unix-1.9/data/gcc539/makerules/dll
--- sdk2unix-1.9/data/gcc539/makerules.orig/dll	2005-11-25 12:15:27.000000000 +0200
+++ sdk2unix-1.9/data/gcc539/makerules/dll	2006-09-25 12:53:49.000000000 +0300
@@ -22,8 +22,8 @@
 
 %.exp: %.bas
 	@echo "[DLL2  ] $*"
-	@$(DT) -S$(AS) -m arm_interwork --output-lib $*.Lib --def $*.def3 --dllname "$*[$(U3)].dll" --output-exp $*.exp --base-file $*.bas $(EX) $(OBJECTS) $(LIBS)
+	@$(DT) -S$(AS) -m arm_interwork --output-lib $*.lib --def $*.def3 --dllname "$*[$(U3)].dll" --output-exp $*.exp --base-file $*.bas $(EX) $(OBJECTS) $(LIBS)
 
 %.dll: %.ex2
 	@echo "[PETRAN] $*"
-	@$(PT) $*.ex2 $*.dll -nocall -uid1 0x$(U1) -uid2 0x$(U2) -uid3 0x$(U3)
+	@$(PT) $*.ex2 $*.dll -nocall -uid1 0x$(U1) -uid2 0x$(U2) -uid3 0x$(U3) $(PTFLAGS)
diff -urN sdk2unix-1.9/data/gcc539/makerules.orig/eikon sdk2unix-1.9/data/gcc539/makerules/eikon
--- sdk2unix-1.9/data/gcc539/makerules.orig/eikon	2005-11-25 12:15:13.000000000 +0200
+++ sdk2unix-1.9/data/gcc539/makerules/eikon	2006-09-24 15:25:05.000000000 +0300
@@ -22,4 +22,4 @@
 
 %.exp: %.bas
 	@echo "[DLL2  ] $*"
-	@$(DT) -S $(AS) -m arm_interwork --def $*.def1 --dllname "$*[$(U3)].APP" --output-exp $*.exp --base-file $*.bas
+	@$(DT) -S $(AS) -m arm_interwork --def $*.def1 --dllname "$*[$(U3)].APP" --output-exp $*.exp --base-file $*.bas --output-lib $*.lib
diff -urN sdk2unix-1.9/data/gcc539/makerules.orig/epoc.general sdk2unix-1.9/data/gcc539/makerules/epoc.general
--- sdk2unix-1.9/data/gcc539/makerules.orig/epoc.general	2005-11-25 12:15:06.000000000 +0200
+++ sdk2unix-1.9/data/gcc539/makerules/epoc.general	2006-09-24 15:25:09.000000000 +0300
@@ -34,15 +34,15 @@
 
 %.ex2: %.exp
 	@echo "[LD2   ] $*"
-	@$(LD) $(LDFLAGS) -o $*.ex2 $*.exp $(EX) $(OBJECTS) $(LIBS)
+	@$(LD) $(LDFLAGS) -o $*.ex2 $*.exp $(EX) $(OBJECTS) $(LIBS) -M > $*.map
 
 %.exe: %.ex2
 	@echo "[PETRAN] $*"
-	@$(PT) $*.ex2 $*.exe -nocall -uid1 0x$(U1) -uid2 0x$(U2) -uid3 0x$(U3)
+	@$(PT) $*.ex2 $*.exe -nocall -uid1 0x$(U1) -uid2 0x$(U2) -uid3 0x$(U3) $(PTFLAGS)
 
 %.app: %.ex2
 	@echo "[PETRAN] $*"
-	@$(PT) $*.ex2 $*.app -nocall -uid1 0x$(U1) -uid2 0x$(U2) -uid3 0x$(U3)
+	@$(PT) $*.ex2 $*.app -nocall -uid1 0x$(U1) -uid2 0x$(U2) -uid3 0x$(U3) $(PTFLAGS)
 
 %.aif: %.aifspec
 	@echo "[GENAIF] $*"
@@ -59,7 +59,7 @@
 %.rsc: %.rpp
 	@echo "[RCOMP ] $*"
 	@rm -f $*.rsc $*.rs~
-	@$(RC) -u -o$*.rsc -h$*.rs~ -i$*.rss -s$*.rpp
+	@$(RC) $(RCFLAGS) -u -o$*.rsc -h$*.rs~ -i$*.rss -s$*.rpp
 	@cp $*.rs~ $*.rsg; 
 
 # Package stuff
@@ -81,4 +81,4 @@
 .SUFFIXES: .app .c .cpp .cc .o .bas .exe .ex2 .exp .rpp .rsc .def1 .sis .pkg
 .PRECIOUS: %.exp %.ex2 %.def1 %.bas %.map %.rpp %.pkg
 #.PRECIOUS:  %.pkg
-GENERATED = *.app *.o *.ex? *.opx *.def? *.bas *.map *.Lib *.rpp *.rs[cg~] *.sis *.pkg *.aif
+GENERATED = *.app *.o *.ex? *.opx *.def? *.bas *.map *.lib *.rpp *.rs[cg~] *.sis *.pkg *.aif
diff -urN sdk2unix-1.9/data/gcc539/makerules.orig/stdc sdk2unix-1.9/data/gcc539/makerules/stdc
--- sdk2unix-1.9/data/gcc539/makerules.orig/stdc	2005-11-25 12:15:19.000000000 +0200
+++ sdk2unix-1.9/data/gcc539/makerules/stdc	2006-09-24 15:25:12.000000000 +0300
@@ -10,9 +10,9 @@
 LDFLAGS = -s -e _E32Startup -u _E32Startup
 
 %.exp: %.bas
-	@echo [DLL   ] $*"
+	@echo "[DLL   ] $*"
 	$(DT) -S$(AS) -m arm_interwork --output-exp $*.exp --base-file $*.bas $(OBJECTS)
 
 %.bas: %.o
-	@echo [LD    ] $*"
+	@echo "[LD    ] $*"
 	$(LD) $(LDFLAGS) --base-file $*.bas -o $*.ex1 $(EX) $(OBJECTS) $(LIBS)
