diff options
| author | Nico Huber <nico.h@gmx.de> | 2016-01-23 01:24:33 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2016-01-28 00:31:32 +0100 |
| commit | 98fc426a98db7e4dd5fea334edec720721d2a89c (patch) | |
| tree | 16a143c645ccf8bdc13ef38ef700bcc8ae101199 /Makefile.inc | |
| parent | 81b09f40087d1a00afe30e379d2e8460203b1c5c (diff) | |
Move object files to $(obj)/<class>/
Instead of tagging object files with .<class>, move them to a <class>
directory below $(obj)/. This way we can keep a 1:1 mapping between
source- and object-file names.
The 1:1 mapping is a prerequisite for Ada, where the compiler refuses
any other object-file name.
Tested by verifying that the resulting coreboot.rom files didn't change
for all of Jenkins' abuild configurations.
Change-Id: Idb7a8abec4ea0a37021d9fc24cc8583c4d3bf67c
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/13181
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'Makefile.inc')
| -rw-r--r-- | Makefile.inc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Makefile.inc b/Makefile.inc index 86ccc31ed9..583e59add8 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -415,18 +415,6 @@ ramstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c romstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c verstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c -$(obj)/%.ramstage.o $(abspath $(obj))/%.ramstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) - @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC_ramstage) -MMD $(CFLAGS_ramstage) $(CPPFLAGS_ramstage) $(ramstage-c-ccopts) -c -o $@ $< - -$(obj)/%.romstage.o $(abspath $(obj))/%.romstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) - @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC_romstage) -MMD $(CFLAGS_romstage) $(CPPFLAGS_romstage) $(romstage-c-ccopts) -c -o $@ $< - -$(obj)/%.bootblock.o $(abspath $(obj))/%.bootblock.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H) - @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC_bootblock) -MMD $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) $(bootblock-c-ccopts) -c -o $@ $< - $(objgenerated)/libverstage.a: $$(libverstage-objs) rm -f $@ $(AR_libverstage) rcsT $@ $^ @@ -437,8 +425,8 @@ clean-abuild: rm -rf coreboot-builds clean-for-update-target: - rm -f $(obj)/ramstage* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a - rm -rf $(obj)/bootblock* $(obj)/romstage* $(obj)/location.* + rm -f $(obj)/ramstage?* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a + rm -rf $(obj)/bootblock?* $(obj)/romstage?* $(obj)/location.* rm -f $(obj)/option_table.* $(obj)/crt0.S $(obj)/ldscript rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot rm -f $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm |