26 files changed, 88 insertions, 57 deletions
diff --git a/.gitignore b/.gitignore
index e775b63f9..bef2937de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,25 +79,26 @@ mana.creator.user*
 run/*
 my/*
 win/*
-make.log
-make1.log
-make2.log
-make_nsiqcppstyle.txt
-bcmake1
-bmake1
-gprof.png
-gprof.txt
-gmon.out
-makecheck.txt
-makecheck_err.txt
-makeflawfinder.log
-makegprof1
-pmake1
-packwin1
-toolchain.cmake1
-makerats.log
-make_hc.txt
-make_hc2.txt
+build/make.log
+build/make1.log
+build/make2.log
+build/make_nsiqcppstyle.txt
+build/bcmake1
+build/bmake1
+build/gprof.png
+build/gprof.txt
+build/gprof.dot
+build/gmon.out
+build/makecheck.txt
+build/makecheck_err.txt
+build/makeflawfinder.log
+build/makegprof1
+build/pmake1
+build/packwin1
+build/toolchain.cmake1
+build/makerats.log
+build/make_hc.txt
+build/make_hc2.txt
 
 # debian
 debian/*
diff --git a/bcmake b/bcmake
deleted file mode 100755
index fd6196df7..000000000
--- a/bcmake
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-export PATH=/usr/i586-mingw32msvc/bin:$PATH
-CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.cmake . 2>make1.log
-
-make -j5 2>make.log
-
diff --git a/build/bcmake b/build/bcmake
new file mode 100755
index 000000000..21de1da77
--- /dev/null
+++ b/build/bcmake
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd ..
+
+export PATH=/usr/i586-mingw32msvc/bin:$PATH
+CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=build/toolchain.cmake . 2>build/make1.log
+
+make -j5 2>build/make.log
+
diff --git a/bdeb.sh b/build/bdeb.sh
index a09a29f0c..a1b2e5b4b 100755
--- a/bdeb.sh
+++ b/build/bdeb.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+cd ..
 dpkg-buildpackage -rfakeroot -uc -b
diff --git a/bmake b/build/bmake
index 0dea9d942..d99766ea7 100755
--- a/bmake
+++ b/build/bmake
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd ..
+
 #may be
 #-Waggregate-return -Winline 
 
@@ -53,7 +55,7 @@ autoreconf -i
 
 cd po
 #make -j5 update-po 2>../make1.log
-make -j5 update-gmo 2>../make1.log
+make -j5 update-gmo 2>../build/make1.log
 cd ..
-make -j5 2>make2.log
+make -j5 2>build/make2.log
 
diff --git a/bmake0 b/build/bmake0
index 0b32247ef..8dcb357fe 100755
--- a/bmake0
+++ b/build/bmake0
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd ..
+
 #may be
 #-Wshadow -Waggregate-return -Winline 
 
@@ -48,8 +50,8 @@ autoreconf -i
 #--without-librt
 
 cd po
-#make -j5 update-po 2>../make1.log
-make -j5 update-gmo 2>../make1.log
+#make -j5 update-po 2>../build/make1.log
+make -j5 update-gmo 2>../build/make1.log
 cd ..
-make -j5 2>make2.log
+make -j5 2>build/make2.log
 
diff --git a/bmake44 b/build/bmake44
index 08f78be79..ad61b7707 100755
--- a/bmake44
+++ b/build/bmake44
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd ..
+
 #may be
 #-Wshadow -Waggregate-return -Winline 
 
@@ -42,8 +44,8 @@ autoreconf -i
 --mandir=$dir/run/share/man
 
 cd po
-#make -j5 update-po 2>../make1.log
-make -j5 update-gmo 2>../make1.log
+#make -j5 update-po 2>../build/make1.log
+make -j5 update-gmo 2>../build/make1.log
 cd ..
-make -j5 2>make2.log
+make -j5 2>build/make2.log
 
diff --git a/bmake46 b/build/bmake46
index 8874f802b..e4d3e7e8e 100755
--- a/bmake46
+++ b/build/bmake46
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd ..
+
 #may be
 #-Wshadow -Waggregate-return -Winline 
 
@@ -56,8 +58,8 @@ autoreconf -i
 --mandir=$dir/run/share/man
 
 cd po
-#make -j5 update-po 2>../make1.log
-make -j5 update-gmo 2>../make1.log
+#make -j5 update-po 2>../build/make1.log
+make -j5 update-gmo 2>../build/make1.log
 cd ..
-make -j5 2>make2.log
+make -j5 2>build/make2.log
 
diff --git a/clmake b/build/clmake
index eec44c58f..a290af529 100755
--- a/clmake
+++ b/build/clmake
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+cd ..
 
 dir=`pwd`
 
@@ -12,5 +13,5 @@ export CXX=clang++
 --bindir=$dir/run/bin \
 --mandir=$dir/run/share/man
 
-make -j5 2>make2.log
+make -j5 2>build/make2.log
 
diff --git a/fink.sh b/build/fink.sh
index 8c78dd724..8c74de65a 100755
--- a/fink.sh
+++ b/build/fink.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd ..
+
 FINKDIR=/sw
 GCCVER=4.0
 
@@ -13,7 +15,7 @@ export LDFLAGS="-framework OpenGL"
 dir=`pwd`/run
 #dir=${FINKDIR}
 
-autoreconf -i 2>fink1.log
+autoreconf -i 2>build/fink1.log
 
 # with prefix
 #./configure --enable-applebuild=yes \
@@ -27,8 +29,8 @@ autoreconf -i 2>fink1.log
 --datarootdir=${dir}/share/games \
 --bindir=${dir}/bin \
 --sbindir=${dir}/bin \
---mandir=${dir}/share/man 2>fink2.log
+--mandir=${dir}/share/man 2>build/fink2.log
 
 # simple
 #./configure --enable-applebuild=yes 2>fink2.log 1>fink2_ok.log
-make 2>fink3.log
+make 2>build/fink3.log
diff --git a/makecheck1 b/build/makecheck1
index 790316bf2..96b49e5c7 100755
--- a/makecheck1
+++ b/build/makecheck1
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>makecheck.txt 2>makecheck_err.txt
+cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>makecheck_err.txt
diff --git a/build/makecheck2 b/build/makecheck2
new file mode 100755
index 000000000..b9108b6ef
--- /dev/null
+++ b/build/makecheck2
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >make_nsiqcppstyle.txt
diff --git a/makecheck3 b/build/makecheck3
index e7ddc5f7f..95e04ad28 100755
--- a/makecheck3
+++ b/build/makecheck3
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd src
+cd ../src
 #../../cppcheck/cppcheck --enable=all --force -j 5 -v -I /usr/include -I /usr/include/c++/4.5 -I /usr/include/libxml2 -I /usr/include/SDL . 1>../makecheck.txt 2>../makecheck_err.txt
 #../../cppcheck/cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>../makecheck.txt 2>../makecheck_err.txt
-../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../makecheck.txt 2>../makecheck_err.txt
+../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/makecheck_err.txt
diff --git a/build/makecheck4 b/build/makecheck4
new file mode 100755
index 000000000..852986459
--- /dev/null
+++ b/build/makecheck4
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+../../checkheaders/checkheaders ../src 2>tmp.txt
+sed '/(style): Header not found/d' tmp.txt >makecheck4.txt
+rm tmp.txt
diff --git a/build/makeflawfinder b/build/makeflawfinder
new file mode 100755
index 000000000..9b5ff2809
--- /dev/null
+++ b/build/makeflawfinder
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+flawfinder ../src 1> makeflawfinder.log
+rats ../src 1> makerats.log
diff --git a/makegprof b/build/makegprof
index b1ea32c7b..d408bf0d3 100755
--- a/makegprof
+++ b/build/makegprof
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-mv run/gmon.out .
-gprof run/bin/manaplus >gprof.txt
+mv ../run/gmon.out .
+gprof ../run/bin/manaplus >gprof.txt
 cat gprof.txt | gprof2dot.py >gprof.dot
 cat gprof.dot | dot -Tpng -o gprof.png
diff --git a/build/mclean b/build/mclean
new file mode 100755
index 000000000..fa5ff4ed5
--- /dev/null
+++ b/build/mclean
@@ -0,0 +1,2 @@
+cd ..
+make clean
diff --git a/packwin b/build/packwin
index 633f895b8..cef5d27fa 100755
--- a/packwin
+++ b/build/packwin
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd ..
+
 dir=`pwd`
 
 cd packaging/windows
diff --git a/pmake b/build/pmake
index 6a523efe8..7ad12eaec 100755
--- a/pmake
+++ b/build/pmake
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd ..
+
 dir=`pwd`
 
 export CC=gcc-4.5
@@ -26,5 +28,5 @@ autoreconf -i
             --bindir=$dir/run/bin \
             --mandir=$dir/run/share/man
 
-make -j5 2>make.log
+make -j5 2>build/make.log
 
diff --git a/pmake46 b/build/pmake46
index 361825e86..dc9a5f584 100755
--- a/pmake46
+++ b/build/pmake46
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd ..
+
 dir=`pwd`
 
 export CC=gcc-4.6
@@ -25,5 +27,5 @@ autoreconf -i
             --bindir=$dir/run/bin \
             --mandir=$dir/run/share/man
 
-make -j5 2>make.log
+make -j5 2>build/make.log
 
diff --git a/toolchain.cmake b/build/toolchain.cmake
index c8493c0c5..c8493c0c5 100644
--- a/toolchain.cmake
+++ b/build/toolchain.cmake
diff --git a/toolchain.nightly b/build/toolchain.nightly
index 6093a82f8..6093a82f8 100644
--- a/toolchain.nightly
+++ b/build/toolchain.nightly
diff --git a/update-creator.sh b/build/update-creator.sh
index 781261f5d..f3fc9e28c 100755
--- a/update-creator.sh
+++ b/build/update-creator.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+cd ..
+
 find -name \*.cpp \
   -o -name \*.h \
   -o -name \*.am \
diff --git a/makecheck2 b/makecheck2
deleted file mode 100755
index 566b60005..000000000
--- a/makecheck2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ./src >make_nsiqcppstyle.txt
diff --git a/makeflawfinder b/makeflawfinder
deleted file mode 100755
index 13d7dde19..000000000
--- a/makeflawfinder
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-flawfinder ./src 1> makeflawfinder.log
-rats ./src 1> makerats.log
diff --git a/nightly/buildwindows.sh b/nightly/buildwindows.sh
index ecd7a35f9..b55ea8134 100755
--- a/nightly/buildwindows.sh
+++ b/nightly/buildwindows.sh
@@ -4,13 +4,13 @@ dir=`pwd`
 
 cd ..
 export PATH=/usr/i586-mingw32msvc/bin:$PATH
-CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./toolchain.nightly .
+CXXFLAGS="-Wall -g0 -O3" cmake -DCMAKE_TOOLCHAIN_FILE=./build/toolchain.nightly .
 result=$?
 if [ "$result" != 0 ]; then
     exit $result
 fi
 
-make -j5 2>make.log
+make -j5 2>build/make.log
 result=$?
 if [ "$result" != 0 ]; then
     exit $result