>
> I noticed that there are some hard codes of ./build in the Makefile,
> too. That breaks as soon as someone adjusts $(obj).
>
Attached patch fixes all hard-coded occurrences of build/ in the Makefiles.
Signed-off-by: Myles Watson <myle...@gmail.com>
Thanks,
Myles
Index: svn/Makefile
===================================================================
--- svn.orig/Makefile
+++ svn/Makefile
@@ -35,7 +35,7 @@ export top := $(shell pwd)
export src := $(top)/src
export srck := $(top)/util/kconfig
export obj := $(top)/build
-export objk := $(top)/build/util/kconfig
+export objk := $(obj)/util/kconfig
export sconfig := $(top)/util/sconfig
export yapps2_py := $(sconfig)/yapps2.py
export config_g := $(sconfig)/config.g
@@ -289,8 +289,8 @@ doxygen-clean:
rm -rf $(DOXYGEN_OUTPUT_DIR)
clean: doxygen-clean
- rm -f $(allobjs) build/coreboot* .xcompile
- rm -f build/option_table.* build/crt0_includes.h build/ldscript
+ rm -f $(allobjs) $(obj)/coreboot* .xcompile
+ rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript
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
@@ -300,7 +300,7 @@ distclean: clean
rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
update:
- dongle.py -c /dev/term/1 build/coreboot.rom EOF
+ dongle.py -c /dev/term/1 $(obj)/coreboot.rom EOF
# This include must come _before_ the pattern rules below!
# Order _does_ matter for pattern rules.
@@ -311,7 +311,7 @@ $(obj)/ldoptions: $(obj)/config.h
awk '/^#define ([^"])* ([^"])*$$/ {print $$2 " = " $$3 ";";}' $< > $@
$(obj)/romcc: $(top)/util/romcc/romcc.c
- @printf " HOSTCC build/romcc (this may take a while)\n"
+ @printf " HOSTCC $(obj)/romcc (this may take a while)\n"
$(HOSTCC) -g -O2 -Wall -o $@ $<
.PHONY: $(PHONY) prepare prepare2 clean distclean doxygen doxy coreboot
Index: svn/src/arch/i386/Makefile.inc
===================================================================
--- svn.orig/src/arch/i386/Makefile.inc
+++ svn/src/arch/i386/Makefile.inc
@@ -25,14 +25,13 @@ ifeq ($(CONFIG_PAYLOAD_NONE),y)
@printf " PAYLOAD none (as specified by user)\n"
else
@printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n"
- $(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
+ $(CBFSTOOL) $(obj)/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
endif
ifeq ($(CONFIG_VGA_BIOS),y)
@printf " VGABIOS $(CONFIG_FALLBACK_VGA_BIOS_FILE) $(CONFIG_FALLBACK_VGA_BIOS_ID)\n"
- $(CBFSTOOL) ./build/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom
+ $(CBFSTOOL) $(obj)/coreboot.rom add $(CONFIG_FALLBACK_VGA_BIOS_FILE) "pci$(CONFIG_FALLBACK_VGA_BIOS_ID).rom" optionrom
endif
- @printf " CBFSPRINT build/coreboot.rom\n\n"
- $(CBFSTOOL) build/coreboot.rom print
+ $(CBFSTOOL) $(obj)/coreboot.rom print
#######################################################################
--
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot
