Changed final target name to JavaXXXX and made build with new toolbox library paths.

Makefile

@@ -25,7 +25,7 @@
 #
 # Component specific options:
 #
-COMPONENT  = TextGadget
+COMPONENT  = JavaGadget
 ROM_MODULE = aof.${COMPONENT}
 
 #
@@ -43,8 +43,8 @@ ASM	= objasm
 CPFLAGS = ~cfr~v
 WFLAGS  = ~c~v
 
-CFLAGS   = -c -depend !Depend ${INCLUDES} -zM -ffah -zps1
-INCLUDES = -Itbox:,C:
+CFLAGS   = -c -depend !Depend ${INCLUDES} -zM -ffa -zps1
+INCLUDES = -I<Lib$Dir>.tboxlibs.,C:
 
 #
 # Libraries
@@ -54,8 +54,8 @@ CLIB      = CLIB:o.stubs
 RLIB      = RISCOSLIB:o.risc_oslib
 ROMCSTUBS = RISCOSLIB:o.romcstubs
 ABSSYM    = RISC_OSLib:o.c_abssym
-TBOXLIB   = tbox:o.toolboxlib
-WIMPLIB   = tbox:o.wimplib
+TBOXLIB   = <Lib$Dir>.tboxlibs.o.toolboxlib
+WIMPLIB   = <Lib$Dir>.tboxlibs.o.wimplib
 
 OBJS =\
 	o.Modhdr \
@@ -104,7 +104,7 @@ clean:
 
 ${ROM_MODULE}: ${OBJS} ${TBOXLIB} $(WIMPLIB) ${ROMCSTUBS}
 	${MKDIR} aof
-	${LD} -o $@ -aof -via objs ${TBOXLIB} $(WIMPLIB) ${ROMCSTUBS}
+	${LD} -o $@ -aof ${OBJS} ${TBOXLIB} $(WIMPLIB) ${ROMCSTUBS}
 
 # final link for ROM Image (using given base address)
 rom_link: