Author: uwe Date: 2009-10-28 18:10:51 +0100 (Wed, 28 Oct 2009) New Revision: 4880
Modified: trunk/coreboot-v2/Makefile trunk/coreboot-v2/src/arch/i386/Makefile.inc trunk/coreboot-v2/util/cbfstool/Makefile.inc trunk/coreboot-v2/util/sconfig/config.g trunk/coreboot-v2/util/sconfig/parsedesc.g trunk/coreboot-v2/util/sconfig/yapps2.py Log: Remove all build/ prefixes in the build output. Also, remove one missing hardcoded "build" dir in the distclean target, and clean up files generated by sconfig in 'make clean'. Signed-off-by: Uwe Hermann <[email protected]> Acked-by: Myles Watson <[email protected]> Modified: trunk/coreboot-v2/Makefile =================================================================== --- trunk/coreboot-v2/Makefile 2009-10-28 16:52:48 UTC (rev 4879) +++ trunk/coreboot-v2/Makefile 2009-10-28 17:10:51 UTC (rev 4880) @@ -159,49 +159,49 @@ define objs_c_template $(obj)/$(1)%.o: src/$(1)%.c - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef define objs_S_template $(obj)/$(1)%.o: src/$(1)%.S - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$< endef define initobjs_c_template $(obj)/$(1)%.o: src/$(1)%.c - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef define initobjs_S_template $(obj)/$(1)%.o: src/$(1)%.S - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$< endef define drivers_c_template $(obj)/$(1)%.o: src/$(1)%.c - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef define drivers_S_template $(obj)/$(1)%.o: src/$(1)%.S - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 -DASSEMBLY $$(CFLAGS) -c -o $$@ $$< endef define smmobjs_c_template $(obj)/$(1)%.o: src/$(1)%.c - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef define smmobjs_S_template $(obj)/$(1)%.o: src/$(1)%.S - @printf " CC $$(subst $$(shell pwd)/,,$$(@))\n" + @printf " CC $$(subst $$(obj)/,,$$(@))\n" $(CC) -m32 $$(CFLAGS) -c -o $$@ $$< endef @@ -265,7 +265,7 @@ test -n "$(alldirs)" && mkdir -p $(alldirs) || true prepare2: - @printf " GEN $(subst $(shell pwd)/,,$(obj)/build.h)\n" + @printf " GEN build.h\n" printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.h printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.h printf "#define COREBOOT_V2 \"$(COREBOOT_V2)\"\n" >> $(obj)/build.h @@ -294,9 +294,10 @@ rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm rmdir -p $(alldirs) 2>/dev/null >/dev/null || true + $(MAKE) -C util/sconfig clean distclean: clean - rm -rf build + rm -rf $(obj) rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* update: @@ -311,7 +312,7 @@ awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@ $(obj)/romcc: $(top)/util/romcc/romcc.c - @printf " HOSTCC $(obj)/romcc (this may take a while)\n" + @printf " HOSTCC $(subst $(obj)/,,$(@)) (this may take a while)\n" $(HOSTCC) -g -O2 -Wall -o $@ $< .PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-28 16:52:48 UTC (rev 4879) +++ trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-10-28 17:10:51 UTC (rev 4880) @@ -31,6 +31,7 @@ @printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n" $(CBFSTOOL) $(obj)/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom endif + @printf " CBFSPRINT $(subst $(obj)/,,$(@))\n\n" $(CBFSTOOL) $(obj)/coreboot.rom print @@ -38,7 +39,7 @@ # Build the bootblock $(obj)/coreboot.bootblock: $(obj)/coreboot - @printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" + @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" $(OBJCOPY) -O binary $< $@ $(obj)/ldscript.ld: $(ldscripts) $(obj)/ldoptions @@ -55,7 +56,7 @@ $(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > [email protected] && mv [email protected] $@ $(obj)/coreboot: $(initobjs) $(obj)/ldscript.ld - @printf " LINK $(subst $(shell pwd)/,,$(@))\n" + @printf " LINK $(subst $(obj)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs) $(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map @@ -63,27 +64,27 @@ # i386 specific tools $(obj)/option_table.h $(obj)/option_table.c: $(obj)/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout - @printf " OPTION $(subst $(shell pwd)/,,$(@))\n" + @printf " OPTION $(subst $(obj)/,,$(@))\n" $(obj)/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h --option $(obj)/option_table.c $(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h $(obj)/config.h - @printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" + @printf " HOSTCC $(subst $(obj)/,,$(@))\n" $(HOSTCC) $(HOSTCFLAGS) -include $(obj)/config.h $< -o $@ ####################################################################### # Build the coreboot_ram (stage 2) $(obj)/coreboot_ram: $(obj)/coreboot_ram.o $(src)/config/coreboot_ram.ld #ldoptions - @printf " CC $(subst $(shell pwd)/,,$(@))\n" + @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/config/coreboot_ram.ld $(obj)/coreboot_ram.o $(NM) -n $(obj)/coreboot_ram | sort > $(obj)/coreboot_ram.map $(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME) - @printf " CC $(subst $(shell pwd)/,,$(@))\n" + @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,-\( $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,-\) $(obj)/coreboot.a: $(objs) - @printf " AR $(subst $(shell pwd)/,,$(@))\n" + @printf " AR $(subst $(obj)/,,$(@))\n" rm -f $(obj)/coreboot.a $(AR) cr $(obj)/coreboot.a $(objs) Modified: trunk/coreboot-v2/util/cbfstool/Makefile.inc =================================================================== --- trunk/coreboot-v2/util/cbfstool/Makefile.inc 2009-10-28 16:52:48 UTC (rev 4879) +++ trunk/coreboot-v2/util/cbfstool/Makefile.inc 2009-10-28 17:10:51 UTC (rev 4880) @@ -22,35 +22,35 @@ mkdir -p $@ $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/%.c - printf " HOSTCC $(subst $(shell pwd)/,,$(@))\n" + printf " HOSTCC $(subst $(obj)/,,$(@))\n" $(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc - printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" + printf " HOSTCXX $(subst $(obj)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp - printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" + printf " HOSTCXX $(subst $(obj)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp - printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" + printf " HOSTCXX $(subst $(obj)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp - printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" + printf " HOSTCXX $(subst $(obj)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp - printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" + printf " HOSTCXX $(subst $(obj)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp - printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" + printf " HOSTCXX $(subst $(obj)/,,$(@))\n" $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $< $(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(addprefix $(obj)/util/cbfstool/,$(cbfsobj)) - printf " HOSTCXX $(subst $(shell pwd)/,,$(@)) (link)\n" + printf " HOSTCXX $(subst $(obj)/,,$(@)) (link)\n" $(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj)) endif Modified: trunk/coreboot-v2/util/sconfig/config.g =================================================================== --- trunk/coreboot-v2/util/sconfig/config.g 2009-10-28 16:52:48 UTC (rev 4879) +++ trunk/coreboot-v2/util/sconfig/config.g 2009-10-28 17:10:51 UTC (rev 4880) @@ -886,7 +886,7 @@ def writecode(image): filename = os.path.join(img_dir, "static.c") - print " SCONFIG ", join(filename.split('/')[-5:], '/') + print " SCONFIG ", join(filename.split('/')[-4:], '/') file = safe_open(filename, 'w+') file.write("#include <device/device.h>\n") file.write("#include <device/pci.h>\n") @@ -920,7 +920,7 @@ def writegraph(image): filename = os.path.join(img_dir, "static.dot") - print " SCONFIG ", join(filename.split('/')[-5:], '/') + print " SCONFIG ", join(filename.split('/')[-4:], '/') file = safe_open(filename, 'w+') file.write("digraph devicetree {\n") file.write(" rankdir=LR\n") Modified: trunk/coreboot-v2/util/sconfig/parsedesc.g =================================================================== --- trunk/coreboot-v2/util/sconfig/parsedesc.g 2009-10-28 16:52:48 UTC (rev 4879) +++ trunk/coreboot-v2/util/sconfig/parsedesc.g 2009-10-28 17:10:51 UTC (rev 4880) @@ -126,7 +126,7 @@ if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename - print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/') + print ' SCONFIG ', join(outputfilename.split('/')[-4:], '/') DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc Modified: trunk/coreboot-v2/util/sconfig/yapps2.py =================================================================== --- trunk/coreboot-v2/util/sconfig/yapps2.py 2009-10-28 16:52:48 UTC (rev 4879) +++ trunk/coreboot-v2/util/sconfig/yapps2.py 2009-10-28 17:10:51 UTC (rev 4880) @@ -710,7 +710,7 @@ if inputfilename[-2:]=='.g': outputfilename = inputfilename[:-2]+'.py' else: raise "Invalid Filename", outputfilename - print ' SCONFIG ', join(outputfilename.split('/')[-5:], '/') + print ' SCONFIG ', join(outputfilename.split('/')[-4:], '/') DIVIDER = '\n%%\n' # This pattern separates the pre/post parsers preparser, postparser = None, None # Code before and after the parser desc -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
