Changes to include glib sources

Makefile

@@ -56,7 +56,6 @@ ROMCSTUBS = RISCOSLIB:o.romcstubs
 ABSSYM    = RISC_OSLib:o.abssym
 TBOXLIB   = tbox:o.toolboxlib
 WIMPLIB   = tbox:o.wimplib
-GLIB      = tbox:o.glib
 
 OBJS =\
 	o.Modhdr \
@@ -73,12 +72,16 @@ OBJS =\
 	o.Text \
 	o.ScrollLisS \
 	o.Utils \
-	o.TAsel_ven
+	o.TAsel_ven \
+	o.glib \
+	o.glib3 \
+	o.rmensure \
+	o.string32
 #
 # Rule patterns
 #
 .c.o:;    ${CC} ${CFLAGS} -o $@ $<
-.cmhg.o:; ${CMHG} -O $@ $<
+.cmhg.o:; ${CMHG} -o $@ $<
 .s.o:;    $(ASM) $< $@
 
 #
@@ -99,9 +102,9 @@ clean:
 	${WIPE} map ${WFLAGS}
 	@echo ${COMPONENT}: cleaned
 
-${ROM_MODULE}: ${OBJS} ${TBOXLIB} $(WIMPLIB) $(GLIB) # ${ROMCSTUBS}
+${ROM_MODULE}: ${OBJS} ${TBOXLIB} $(WIMPLIB) # ${ROMCSTUBS}
 	${MKDIR} aof
-	${LD} -o $@ -aof ${OBJS} ${TBOXLIB} $(WIMPLIB) $(GLIB) ${ROMCSTUBS}
+	${LD} -o $@ -aof -via objs ${TBOXLIB} $(WIMPLIB) ${ROMCSTUBS}
 
 # final link for ROM Image (using given base address)
 rom_link: