From d2578871ad1e6847283646d4f10e58cf5c7da548 Mon Sep 17 00:00:00 2001
From: Dave Murphy <wntrmute@users.sourceforge.net>
Date: Wed, 15 Jun 2005 16:25:12 +0000
Subject: [PATCH] *** empty log message ***

---
 dka-rules/base_rules       | 20 ++++++++++----------
 dka-scripts/build-crtls.sh |  4 ++--
 dka-scripts/build-tools.sh | 20 --------------------
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/dka-rules/base_rules b/dka-rules/base_rules
index ffa6bf4..db45f61 100644
--- a/dka-rules/base_rules
+++ b/dka-rules/base_rules
@@ -44,17 +44,17 @@ export OBJCOPY	:=	$(PREFIX)objcopy
 # canned command sequence for binary data
 #---------------------------------------------------------------------------------
 define bin2o
-	cp $(<) $(*).tmp
-	alignbin $(*).tmp
+	cp $(<) $(<F)
+	padbin 4 $(<F)
 	$(OBJCOPY) -I binary -O elf32-littlearm -B arm \
 	--rename-section .data=.rodata,readonly,data,contents,alloc \
-	--redefine-sym _binary_`(echo $(*) | tr . _)`_tmp_start=`(echo $(*) | tr . _)`\
-	--redefine-sym _binary_`(echo $(*) | tr . _)`_tmp_end=`(echo $(*) | tr . _)`_end\
-	--redefine-sym _binary_`(echo $(*) | tr . _)`_tmp_size=`(echo $(*) | tr . _)`_size\
-	$(*).tmp $(@)
-	echo "extern const u32" `(echo $(*) | tr . _)`"_end[];" >> $(*).h
-	echo "extern const u8" `(echo $(*) | tr . _)`"[];" >> $(*).h
-	echo "extern const u32" `(echo $(*) | tr . _)`_size[]";" >> $(*).h
-	rm $(*).tmp
+	--redefine-sym _binary_`(echo $(<F) | tr . _)`_start=`(echo $(<F) | tr . _)`\
+	--redefine-sym _binary_`(echo $(<F) | tr . _)`_end=`(echo $(<F) | tr . _)`_end\
+	--redefine-sym _binary_`(echo $(<F) | tr . _)`_size=`(echo $(<F) | tr . _)`_size\
+	$(<F) $(@)
+	echo "extern const u32" `(echo $(<F) | tr . _)`"_end[];" > `(echo $(<F) | tr . _)`.h
+	echo "extern const u8" `(echo $(<F) | tr . _)`"[];" >> `(echo $(<F) | tr . _)`.h
+	echo "extern const u32" `(echo $(<F) | tr . _)`_size[]";" >> `(echo $(<F) | tr . _)`.h
+	rm $(<F)
 endef
 
diff --git a/dka-scripts/build-crtls.sh b/dka-scripts/build-crtls.sh
index e4eb0b1..0ed4cf6 100644
--- a/dka-scripts/build-crtls.sh
+++ b/dka-scripts/build-crtls.sh
@@ -19,8 +19,8 @@ $MAKE CRT=ds_cart
 
 cd $BUILDSCRIPTDIR
 
-chmod +x tools/general/alignbin
-cp tools/general/alignbin $DEVKITARM/bin/alignbin
+$MAKE -C tools/general
+$MAKE -C tools/general install PREFIX=$DEVKITARM/bin
 
 #---------------------------------------------------------------------------------
 # copy base rulesets
diff --git a/dka-scripts/build-tools.sh b/dka-scripts/build-tools.sh
index e4a1c1c..dfa4d86 100644
--- a/dka-scripts/build-tools.sh
+++ b/dka-scripts/build-tools.sh
@@ -1,23 +1,6 @@
 #!/bin/sh
 
-prefix=$INSTALLDIR/devkitARM
 
-gcc -O2 tools/gba/gbafix.c
-
-if [  -f a.out ]
-	then
-		exeext=
-		rm a.out
-else
-	if [  -f a.exe ]
-	then
-		exeext=.exe
-		rm a.exe
-	else
-		echo "Error: Failed to build tools"
-		exit -1
-	fi
-fi
 export DEVKITARM=$TOOLPATH/devkitARM
 export DEVKITPRO=$TOOLPATH
 
@@ -27,9 +10,6 @@ $MAKE -C tools/gba install PREFIX=$DEVKITARM/bin
 $MAKE -C tools/gp32
 $MAKE -C tools/gp32 install PREFIX=$DEVKITARM/bin
 
-$MAKE -C tools/general
-$MAKE -C tools/general install PREFIX=$DEVKITARM/bin
-
 $MAKE -C tools/nds/
 $MAKE -C tools/nds/ install PREFIX=$DEVKITARM/bin