diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2009-07-13 20:31:35 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2009-07-13 20:31:35 -0400 |
| commit | e6caca882f3511761d8487125790bfccae37bae1 (patch) | |
| tree | 0c9834dba27d7d29518a746058c2c921376ddfbc /Makefile | |
| parent | 0c5893d761f25d8e681a3880db9761713306dc5f (diff) | |
| download | seabios-e6caca882f3511761d8487125790bfccae37bae1.tar.gz | |
Minor - clarify intermediate object file names.
Rename romlayout16.o to code16.o.
Rename ccode32.o to code32.o.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -106,31 +106,33 @@ $(OUT)asm-offsets.h: $(OUT)asm-offsets.s @echo " Generating offset file $@" $(Q)./tools/gen-offsets.sh $< $@ + $(OUT)ccode.16.s: ; $(call whole-compile, $(CFLAGS16) -S, $(addprefix src/, $(SRC16)),$@) -$(OUT)romlayout16.o: romlayout.S $(OUT)ccode.16.s $(OUT)asm-offsets.h +$(OUT)code16.o: romlayout.S $(OUT)ccode.16.s $(OUT)asm-offsets.h @echo " Compiling (16bit) $@" $(Q)$(CC) $(CFLAGS16INC) -c -D__ASSEMBLY__ $< -o $@ -$(OUT)ccode32.o: ; $(call whole-compile, $(CFLAGS), $(addprefix src/, $(SRC32)),$@) - -$(OUT)rom32.o: $(OUT)ccode32.o $(OUT)rombios32.lds - @echo " Linking (no relocs) $@" - $(Q)$(LD) -r -T $(OUT)rombios32.lds $< -o $@ +$(OUT)code32.o: ; $(call whole-compile, $(CFLAGS), $(addprefix src/, $(SRC32)),$@) -$(OUT)romlayout16.lds $(OUT)romlayout32.lds: $(OUT)ccode32.o $(OUT)romlayout16.o +$(OUT)romlayout16.lds $(OUT)romlayout32.lds: $(OUT)code32.o $(OUT)code16.o @echo " Building layout information $@" - $(Q)$(OBJDUMP) -thr $(OUT)ccode32.o > $(OUT)ccode32.o.objdump - $(Q)$(OBJDUMP) -thr $(OUT)romlayout16.o > $(OUT)romlayout16.o.objdump - $(Q)./tools/layoutrom.py $(OUT)romlayout16.o.objdump $(OUT)ccode32.o.objdump $(OUT)romlayout16.lds $(OUT)romlayout32.lds + $(Q)$(OBJDUMP) -thr $(OUT)code32.o > $(OUT)code32.o.objdump + $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump + $(Q)./tools/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32.o.objdump $(OUT)romlayout16.lds $(OUT)romlayout32.lds $(OUT)layout16.lds: $(OUT)romlayout16.lds $(OUT)rombios32.lds: $(OUT)romlayout32.lds -$(OUT)rom16.o: $(OUT)romlayout16.o $(OUT)rom32.o $(OUT)layout16.lds + +$(OUT)rom16.o: $(OUT)code16.o $(OUT)rom32.o $(OUT)layout16.lds @echo " Linking (no relocs) $@" $(Q)$(LD) -r -T $(OUT)layout16.lds $< -o $@ +$(OUT)rom32.o: $(OUT)code32.o $(OUT)rombios32.lds + @echo " Linking (no relocs) $@" + $(Q)$(LD) -r -T $(OUT)rombios32.lds $< -o $@ + $(OUT)rom.o: $(OUT)rom16.o $(OUT)rom32.o $(OUT)rombios16.lds $(OUT)rombios.lds @echo " Linking $@" $(Q)$(LD) -T $(OUT)rombios16.lds $(OUT)rom16.o -R $(OUT)rom32.o -o $(OUT)rom16.reloc.o |