diff --git a/Makefile b/Makefile index 9667bcd08f8c9ac4fc4dac764e3aa0b3f751063d..da6df0725674ae0206f7b15776be01e5e97db1f4 100644 --- a/Makefile +++ b/Makefile @@ -464,23 +464,24 @@ aof.CLib: ${CLIB_ROM_OBJS} # # Final link for the ROM Image {using given base address} # -linked.RISC_OSLib: ${ROM_OBJS} - ${LD} -o $@ ${ROM_OBJS} \ +rom_link_RISC_OSLib: ${ROM_OBJS} + ${LD} -o linked.RISC_OSLib ${ROM_OBJS} \ -symbols syms.${TARGET} \ -bin -base ${ADDRESS} \ -map > map.${TARGET} -linked.CLib: ${CLIB_ROM_OBJS} - ${LD} -o $@ ${CLIB_ROM_OBJS} \ +rom_link_CLib: ${CLIB_ROM_OBJS} + ${LD} -o linked.CLib ${CLIB_ROM_OBJS} \ -symbols syms.${TARGET} \ -bin -base ${ADDRESS} \ -map > map.${TARGET} -rom_link: linked.${TARGET} +rom_link: rom_link_${TARGET} ${CP} linked.${TARGET} ${LINKDIR}.${TARGET} ${CPFLAGS} | if "${TARGET}"="RISC_OSLib" Then Set ExtraLibs$xtentries rlib.s.rl_entries Else Unset ExtraLibs$xtentries - do xtentries syms.Entries kernel.s.k_entries clib.s.cl_entries <ExtraLibs$xtentries> + @echo xtentries syms.Entries kernel.s.k_entries clib.s.cl_entries <ExtraLibs$xtentries> + @do xtentries syms.Entries kernel.s.k_entries clib.s.cl_entries <ExtraLibs$xtentries> unset ExtraLibs$xtentries print rlib.swi { >> syms.Entries } xtentries syms.C_Entries kernel.s.k_entries clib.s.cl_entries diff --git a/VersionASM b/VersionASM index 68053c7d6e254dfea0ac738b194d770f2c2d0369..4de8b453d8ea0e6d97c5cb4cfe3b2858f53e73ea 100644 --- a/VersionASM +++ b/VersionASM @@ -8,11 +8,11 @@ GBLS Module_FullVersion GBLS Module_ApplicationDate2 GBLS Module_ApplicationDate4 -Module_MajorVersion SETS "5.12" -Module_Version SETA 512 +Module_MajorVersion SETS "5.13" +Module_Version SETA 513 Module_MinorVersion SETS "" -Module_Date SETS "15 Aug 2000" -Module_ApplicationDate2 SETS "15-Aug-00" -Module_ApplicationDate4 SETS "15-Aug-2000" -Module_FullVersion SETS "5.12" +Module_Date SETS "17 Aug 2000" +Module_ApplicationDate2 SETS "17-Aug-00" +Module_ApplicationDate4 SETS "17-Aug-2000" +Module_FullVersion SETS "5.13" END diff --git a/VersionNum b/VersionNum index 27d097327f354adce5c3885895c311475cbe8a40..f0449bb7a976970a11a62cc0de58f9f606144647 100644 --- a/VersionNum +++ b/VersionNum @@ -1,18 +1,18 @@ -/* (5.12) +/* (5.13) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 5.12 +#define Module_MajorVersion_CMHG 5.13 #define Module_MinorVersion_CMHG -#define Module_Date_CMHG 15 Aug 2000 +#define Module_Date_CMHG 17 Aug 2000 -#define Module_MajorVersion "5.12" -#define Module_Version 512 +#define Module_MajorVersion "5.13" +#define Module_Version 513 #define Module_MinorVersion "" -#define Module_Date "15 Aug 2000" +#define Module_Date "17 Aug 2000" -#define Module_ApplicationDate2 "15-Aug-00" -#define Module_ApplicationDate4 "15-Aug-2000" +#define Module_ApplicationDate2 "17-Aug-00" +#define Module_ApplicationDate4 "17-Aug-2000" -#define Module_FullVersion "5.12" +#define Module_FullVersion "5.13"