[SeaBIOS] [PATCH] build: Don't require $(OUT) to be a sub-directory of the main directory.
Kevin O'Connor
kevin at koconnor.net
Sun Feb 17 17:07:49 CET 2013
Remove references to "../" and "out/" from the build so that "make
OUT=/a/b/c/" will work.
Signed-off-by: Kevin O'Connor <kevin at koconnor.net>
---
Makefile | 4 ++--
src/Kconfig | 2 +-
tools/test-build.sh | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index fb0c89b..ab9ca0e 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ vpath %.S src vgasrc
################ Common build rules
# Verify the build environment works.
-TESTGCC:=$(shell CC="$(CC)" LD="$(LD)" IASL="$(IASL)" tools/test-build.sh)
+TESTGCC:=$(shell OUT="$(OUT)" CC="$(CC)" LD="$(LD)" IASL="$(IASL)" tools/test-build.sh)
ifeq "$(TESTGCC)" "-1"
$(error "Please upgrade the build environment")
endif
@@ -97,7 +97,7 @@ endif
# Do a whole file compile by textually including all C code.
define whole-compile
@echo " Compiling whole program $3"
-$(Q)printf '$(foreach i,$2,#include "../$i"\n)' > $3.tmp.c
+$(Q)printf '$(foreach i,$2,#include "$(CURDIR)/$i"\n)' > $3.tmp.c
$(Q)$(CC) $1 $(CFLAGSWHOLE) -c $3.tmp.c -o $3
endef
diff --git a/src/Kconfig b/src/Kconfig
index 6c9ab5f..119ea34 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -380,7 +380,7 @@ menu "BIOS Tables"
Support generation of ACPI tables.
endmenu
-source ../vgasrc/Kconfig
+source vgasrc/Kconfig
menu "Debugging"
config DEBUG_LEVEL
diff --git a/tools/test-build.sh b/tools/test-build.sh
index 7bd6d1f..ce0aca9 100755
--- a/tools/test-build.sh
+++ b/tools/test-build.sh
@@ -14,13 +14,13 @@ if [ $? -ne 0 ]; then
exit 0
fi
-mkdir -p out
-TMPFILE1=out/tmp_testcompile1.c
-TMPFILE1o=out/tmp_testcompile1.o
-TMPFILE1_ld=out/tmp_testcompile1.lds
-TMPFILE2=out/tmp_testcompile2.c
-TMPFILE2o=out/tmp_testcompile2.o
-TMPFILE3o=out/tmp_testcompile3.o
+mkdir -p ${OUT}
+TMPFILE1=${OUT}/tmp_testcompile1.c
+TMPFILE1o=${OUT}/tmp_testcompile1.o
+TMPFILE1_ld=${OUT}/tmp_testcompile1.lds
+TMPFILE2=${OUT}/tmp_testcompile2.c
+TMPFILE2o=${OUT}/tmp_testcompile2.o
+TMPFILE3o=${OUT}/tmp_testcompile3.o
# Test if ld's alignment handling is correct. This is a known problem
# with the linker that ships with Ubuntu 11.04.
--
1.7.11.7
More information about the SeaBIOS
mailing list