Support non-local build directory - allow "make OUT=abc/" to work.

Don't require the build directory to be the "out/" directory of the
SeaBIOS source.

diff --git a/Makefile b/Makefile
index f8f8fc4f8578e4b1d105ec350ad9c027f5b8c204..b19281d719b1b946ee8da0626c03f3974fcac4f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \
               /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;)
 
 # Default compiler flags
-COMMONCFLAGS = -Os -MD -Wall -Wno-strict-aliasing -Wold-style-definition \
+COMMONCFLAGS = -I$(OUT) -Os -MD \
+               -Wall -Wno-strict-aliasing -Wold-style-definition \
                $(call cc-option,$(CC),-Wtype-limits,) \
                -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \
                -mrtd -minline-all-stringops \

diff --git a/src/config.h b/src/config.h
index 63569419e8d719146bfba9836341c3cf7b5e23a5..467ea89af42041a0ea7a7c07e06fb87ff31316c6 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -1,7 +1,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include "../out/autoconf.h"
+#include "autoconf.h"
 
 // Configuration definitions.
 

diff --git a/src/romlayout.S b/src/romlayout.S
index 3dfec781299b821316241101381f8fe5c74d68b9..f540c1e99c3833b6944c49ea7b2ead38456424a3 100644 (file)
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -11,13 +11,13 @@
  ****************************************************************/
 
         .code16gcc
-.include "out/ccode.16.s"
+#include "ccode.16.s"
 
 #include "config.h" // CONFIG_*
 #include "ioport.h" // PORT_A20
 #include "bregs.h" // CR0_*
 #include "cmos.h" // CMOS_RESET_CODE
-#include "../out/asm-offsets.h" // BREGS_*
+#include "asm-offsets.h" // BREGS_*
 #include "entryfuncs.S" // ENTRY_*
 
 

diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S
index b99cf6f3566b24c0da91c1fb04ff511e2f1c58fe..fbfa9f7b16baa40d254559019016586da680e4e3 100644 (file)
--- a/vgasrc/vgaentry.S
+++ b/vgasrc/vgaentry.S
@@ -10,7 +10,7 @@
  ****************************************************************/
 
         .code16gcc
-.include "out/vgaccode.16.s"
+#include "vgaccode.16.s"
 
 #include "entryfuncs.S" // ENTRY_*