X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=bootstrap.sh;h=dd0e8a6e09748f5f8e9eddc2f0caaeb2bcef6bd2;hb=fa2beaa15ccc64956b12d6d81d95a11538748327;hp=70d032399886d10d9bd983342a426e47866be271;hpb=f6d5474a93bf1bf630d443b3872b38b96b21cc02;p=builder.git

diff --git a/bootstrap.sh b/bootstrap.sh
index 70d0323..dd0e8a6 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -33,6 +33,9 @@ while [ "$1" ]; do
 	--prefix=*)
 		PREFIX="${1#--prefix=}"
 		;;
+	--keep-temp)
+		KEEP_TEMP=yes
+		;;
 	*)
 		echo "Unknown option $1"
 		exit 1
@@ -56,12 +59,17 @@ for i in $REQUIRED; do
 	if [ -z "$path"  -o ! -d "$path/source" ]; then
 		missing="$missing msp$i"
 	else
-		if [ $i = "core" ]; then
-			ln -sf $path/source/* "$INCLUDEDIR/msp/"
-		else
-			ln -sf $path/source "$INCLUDEDIR/msp/$i"
-		fi
-		sources="$sources `find $path/source -name '*.cpp'`"
+		headers=`find $path/source \( -name windows -prune \) -o \( -name '*.h' -print \)`
+		for j in $headers; do
+			rel=${j#$path/source/}
+			comp=${rel%%/*}
+			if [ "$comp" = "$rel" ]; then
+				comp=$i
+			fi
+			mkdir -p "$INCLUDEDIR/msp/$comp"
+			ln -sf $j "$INCLUDEDIR/msp/$comp/"
+		done
+		sources="$sources `find $path/source \( -name windows -prune \) -o \( -name '*.cpp' -print \)`"
 	fi
 done
 
@@ -73,7 +81,25 @@ if [ ! -z "$missing" ]; then
 fi
 
 echo "Compiling builder-stage1.  This may take several minutes."
-g++ $sources -o builder-stage1 $CFLAGS $LIBS
+objects=""
+for i in $sources; do
+	obj=`mktemp --tmpdir=temp/bootstrap XXXXXX.o`
+	dir=${i%/*}
+	dir=${dir%/unix}
+	flags="$CFLAGS"
+	if [ -d "$dir/unix" ]; then
+		flags="$flags -iquote $dir -iquote $dir/unix"
+	fi
+	g++ -c $i -o $obj $flags
+	objects="$objects $obj"
+done
+g++ $objects -o builder-stage1 $LIBS
+
+if [ "$KEEP_TEMP" != "yes" ]; then
+	echo "Cleaning up"
+	rm -r temp/bootstrap
+fi
+
 echo "Using builder-stage1 to compile builder."
 ARGS=
 if [ "$PREFIX" ]; then