Imported Debian patch 1.2.1-1

[debian/splat] / utils / build

diff --git a/utils/build b/utils/build
index fbc7581b2d448144795f76e0b12964c00df79761..a997e8455853dc2b6e6e7fe2b49550c124d2f446 100755 (executable)
--- a/utils/build
+++ b/utils/build
@@ -1,32 +1,43 @@
 #!/bin/bash
 #
 # Simple shell script for building SPLAT! and associated utilities.
-# Written by John A. Magliacane, KD2BD May 2002
+# Written by John A. Magliacane, KD2BD May 2002.  Updated October 2007.
 #
 
 build_citydecoder()
 {
        echo -n "Compiling citydecoder... "
-       cc -Wall -O3 -s -fomit-frame-pointer citydecoder.c -o citydecoder
+       cc -Wall -O3 -fomit-frame-pointer citydecoder.c -o citydecoder
        echo "Done!"
 }
 
 build_usgs2sdf()
 {
        echo -n "Compiling usgs2sdf... "
-       cc -Wall -O3 -s -fomit-frame-pointer usgs2sdf.c -o usgs2sdf
+       cc -Wall -O3 -fomit-frame-pointer usgs2sdf.c -o usgs2sdf
+       echo "Done!"
+}
+
+build_srtm2sdf()
+{
+       echo -n "Compiling srtm2sdf... "
+<<<<<<< build
+       cc -Wall -O3 -lbz2 -fomit-frame-pointer srtm2sdf.c -o srtm2sdf
+=======
+       cc -Wall -O3 -s -fomit-frame-pointer srtm2sdf.c -lbz2 -o srtm2sdf
+>>>>>>> 1.1.1.4
        echo "Done!"
 }
 
 build_fontdata()
 {
        echo -n "Compiling fontdata... "
-       cc -Wall -O3 -s -lz -fomit-frame-pointer fontdata.c -o fontdata
+       cc -Wall -O3 -lz -fomit-frame-pointer fontdata.c -o fontdata
        echo "Done!"
 }
 
 if [ $# == "0" ]; then
-       echo "Usage: build  { citydecoder, usgs2sdf, fontdata, all }"
+       echo "Usage: build  { citydecoder, srtm2sdf, usgs2sdf, fontdata, all }"
 else
 
        if [ $1 == "citydecoder" ]; then
@@ -37,6 +48,9 @@ else
                build_usgs2sdf
        fi
 
+       if [ $1 == "srtm2sdf" ]; then
+               build_srtm2sdf
+       fi
        if [ $1 == "fontdata" ]; then
                build_fontdata
        fi
@@ -48,10 +62,11 @@ else
        if [ $1 == "all" ]; then
                build_citydecoder
                build_usgs2sdf
+               build_srtm2sdf
                build_fontdata
        fi
 
-       if [ $1 != "citydecoder" ] && [ $1 != "usgs2sdf" ] && [ $1 != "fontdata" ] && [ $1 != "clean" ] && [ $1 != "all" ]; then
-               echo "Usage: build { citydecoder, usgs2sdf, fontdata, all }"
+       if [ $1 != "citydecoder" ] && [ $1 != "srtm2sdf" ] && [ $1 != "usgs2sdf" ] && [ $1 != "fontdata" ] && [ $1 != "clean" ] && [ $1 != "all" ]; then
+               echo "Usage: build { citydecoder, srtm2sdf, usgs2sdf, fontdata, all }"
        fi
 fi