[tyndur-devel] [PATCH 1/2] * BUILD_ROOT und den Pfad zu fpc von Makefile nach Makefile.local verschoben

[Jörg Pfähler <bluecoder@xxxxxx>]

---
 .gitignore |    1 +
 Makefile   |    8 +++++---
 buildmk.sh |   13 ++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0467f1..efd738e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.o
 *.mod
 Makefile
+Makefile.local
 *.a
 *.ppu
 link.res
diff --git a/Makefile b/Makefile
index a58a079..83ed21a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
+-include Makefile.local
+
 CC=gcc -m32 -g -c -fno-stack-protector -nostdinc -fno-leading-underscore -fno-omit-frame-pointer -Wall -Werror -Wstrict-prototypes -fno-strict-aliasing -O2 -fno-builtin -I .   
 CPP=g++ -m32 -g -c -fno-stack-protector -fno-leading-underscore -fno-omit-frame-pointer -Wall -fno-strict-aliasing -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-use-cxa-atexit -O0 
-PPC=fpc -n -Cn -CX -Ttyndur  -Fu../lib/units -Fu../units
+PPC=$(PPC_BIANRY) -n -Cn -CX -Ttyndur  -Fu../lib/units -Fu../units
 
 ASM_ELF=nasm -felf -O99 
 ASM_BIN=nasm -fbin -O99
 
-BUILD_ROOT=/home/kevin/entwicklung/tyndur/build/output
 BUILD_DIR=$(BUILD_ROOT)
 
 AS=as -32
@@ -31,7 +32,8 @@ softclean: clean_objs
 	for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" softclean; fi done
 
 clean: clean_objs
-	for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done  
+	for file in *; do if [ -f "$$file/Makefile" -a \( ! -f "$$file/.nobuild" -o -f "$$file/.ignorenobuild" \) ]; then $(MAKE) -sC "$$file" clean; rm "$$file/Makefile"; fi done
+	rm Makefile.local
 
 .SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd
 clean: clean_root
diff --git a/buildmk.sh b/buildmk.sh
index 8361bea..345e512 100644
--- a/buildmk.sh
+++ b/buildmk.sh
@@ -82,15 +82,21 @@ if [ -f Makefile.conf ]; then
     source Makefile.conf
 fi
 
+cat <<EOF > Makefile.local
+BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output
+PPC_BIANRY=$LOST_TOOLS_PPC
+EOF
+
 cat <<EOF > Makefile
+-include Makefile.local
+
 CC=$LOST_TOOLS_GCC $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND
 CPP=$LOST_TOOLS_GPP $INCLUDES
-PPC=$LOST_TOOLS_PPC -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units
+PPC=\$(PPC_BIANRY) -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units
 
 ASM_ELF=nasm -felf -O99 $NASMINCLUDES
 ASM_BIN=nasm -fbin -O99
 
-BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output
 BUILD_DIR=`pwd | sed s#^$LOST_BUILDMK_ROOT#\$\(BUILD_ROOT\)#`
 
 AS=$LOST_TOOLS_AS
@@ -232,7 +238,8 @@ softclean: clean_objs
 	for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" softclean; fi done
 
 clean: clean_objs
-	for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done  
+	for file in *; do if [ -f "\$\$file/Makefile" -a \( ! -f "\$\$file/.nobuild" -o -f "\$\$file/.ignorenobuild" \) ]; then \$(MAKE) -sC "\$\$file" clean; rm "\$\$file/Makefile"; fi done
+	rm Makefile.local
 
 .SILENT: all makefiles subdirs obj clean softclean clean_objs clean_root updateroot image-floppy image-hd test-qemu test-qemu-hd
 EOF
-- 
1.7.1