diff --git a/makefile b/makefile index 4aa4eede..3bf878bb 100644 --- a/makefile +++ b/makefile @@ -255,6 +255,8 @@ stage6: stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64 index 33c55593..8810a4cc 100644 --- a/makefile.darwin.clang.x86_64 +++ b/makefile.darwin.clang.x86_64 @@ -80,7 +80,7 @@ stage2: stage3: $(VOCSTATIC0) -siapxPS SYSTEM.Mod - $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod + $(VOCSTATIC0) -sPS Args.Mod Console.Mod Unix.Mod sed -i.tmp "s#/opt#$(PRF)#g" src/voc/prf.Mod $(VOCSTATIC0) -sPS prf.Mod $(VOCSTATIC0) -sPS oocOakStrings.Mod architecture.Mod version.Mod Kernel.Mod Modules.Mod @@ -102,9 +102,9 @@ stage4: #this is a way to create a bootstrap binary. stage5: $(CC) SYSTEM.c Args.c Console.c Modules.c Unix.c \ - oocOakStrings.c architecture.c version.c Kernel.c Files.c OakFiles.c Reals.c CmdlnTexts.c \ - version.c extTools.c \ - OPM.c OPS.c OPT.c OPC.c OPV.c OPB.c OPP.c errors.c + oocOakStrings.c architecture.c prf.c version.c Kernel.c Files.c OakFiles.c Reals.c CmdlnTexts.c \ + extTools.c \ + OPM.c OPS.c OPT.c OPC.c OPV.c OPB.c OPP.c errors.c $(CL) voc.c -o voc \ SYSTEM.o Args.o Console.o Modules.o Unix.o \ @@ -112,11 +112,11 @@ stage5: extTools.o \ OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o $(CL) BrowserCmd.c -o showdef \ - SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o \ - OPM.o OPS.o OPT.o OPV.o OPC.o errors.o + SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o prf.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o \ + OPM.o OPS.o OPT.o OPV.o OPC.o errors.o $(CL) OCatCmd.c -o ocat \ - SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o + SYSTEM.o Args.o Console.o Modules.o Unix.o oocOakStrings.o architecture.o prf.o version.o Kernel.o Files.o Reals.o CmdlnTexts.o # build all library files stage6: @@ -256,11 +256,13 @@ stage6: # $(VOCSTATIC0) -sPS compatIn.Mod # $(VOCSTATIC0) -smPS vmake.Mod # $(CC) compatIn.c -# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o version.o architecture.o +# $(CL) vmake.c -o vmake SYSTEM.o Args.o compatIn.o CmdlnTexts.o Console.o Files.o Reals.o Modules.o Kernel.o Unix.o oocOakStrings.o oocIntStr.o oocConvTypes.o oocIntConv.o prf.o version.o architecture.o stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o diff --git a/makefile.linux.gnuc.armv6j b/makefile.linux.gnuc.armv6j index 337e769f..b8beb104 100644 --- a/makefile.linux.gnuc.armv6j +++ b/makefile.linux.gnuc.armv6j @@ -255,6 +255,8 @@ stage6: stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o diff --git a/makefile.linux.gnuc.armv6j_hardfp b/makefile.linux.gnuc.armv6j_hardfp index a8a36698..2894402d 100644 --- a/makefile.linux.gnuc.armv6j_hardfp +++ b/makefile.linux.gnuc.armv6j_hardfp @@ -255,6 +255,8 @@ stage6: stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o diff --git a/makefile.linux.gnuc.armv7a_hardfp b/makefile.linux.gnuc.armv7a_hardfp index 45f8f024..5ebc97c7 100644 --- a/makefile.linux.gnuc.armv7a_hardfp +++ b/makefile.linux.gnuc.armv7a_hardfp @@ -255,6 +255,8 @@ stage6: stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o diff --git a/makefile.linux.gnuc.powerpc b/makefile.linux.gnuc.powerpc index c4b20b6f..076c3ea8 100644 --- a/makefile.linux.gnuc.powerpc +++ b/makefile.linux.gnuc.powerpc @@ -255,6 +255,8 @@ stage6: stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o diff --git a/makefile.linux.gnuc.x86 b/makefile.linux.gnuc.x86 index 3a841c8a..caedd065 100644 --- a/makefile.linux.gnuc.x86 +++ b/makefile.linux.gnuc.x86 @@ -255,6 +255,8 @@ stage6: stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o diff --git a/makefile.linux.gnuc.x86_64 b/makefile.linux.gnuc.x86_64 index 4aa4eede..3bf878bb 100644 --- a/makefile.linux.gnuc.x86_64 +++ b/makefile.linux.gnuc.x86_64 @@ -255,6 +255,8 @@ stage6: stage7: + #remove non library objects + rm -f architecture.o prf.o version.o extTools.o OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o errors.o #objects := $(wildcard *.o) #$(LD) objects $(ARCHIVE) *.o