WebSVN – HelenOS-historic – Path Comparison – / – /uspace/ Rev 706 and /uspace/ Rev 705

Ignore whitespace Rev 706 → Rev 705

/uspace/trunk/uspace.config
File deleted

 /uspace/trunk/tools/build
 ,0 → 1,37
+#! /bin/sh
+function syntax {
+    echo "Syntax:"
+    echo " build.<arch> [-compiler <compiler>]"
+    echo
+    echo "<arch>     ... ia32, mips32, mips32el"
+    echo "<compiler> ... native, *cross"
+    echo
+}
+ARCH="`basename "$0" | awk -F. '{ if (NF > 1) print \$NF }'`"
+if [ -z "$ARCH" ]; then
+    syntax
+    exit 1
+fi
+ARGS="ARCH=$ARCH"
+while [ "$#" -gt 0 ]; do
+    case "$1" in
+        -compiler)
+            if [ -z "$2" ]; then
+                syntax
+                exit 1
+            fi
+            ARGS="$ARGS COMPILER=$2"
+            shift
+            ;;
+        *)
+            syntax
+            exit 1
+            ;;
+    esac
+    shift
+done
+make all $ARGS
 Property changes:
 Added: svn:executable
 +*
 \ No newline at end of property

 /uspace/trunk/tools/clean
 ,0 → 1,10
+#! /bin/sh
+ARCH="`basename "$0" | awk -F. '{ if (NF > 1) print \$NF }'`"
+if [ -z "$ARCH" ]; then
+    for ARCH in libc/arch/* ; do
+        make clean "ARCH=`basename "$ARCH"`"
+    done
+else
+    make clean "ARCH=$ARCH"
+fi
 Property changes:
 Added: svn:executable
 +*
 \ No newline at end of property

 /uspace/trunk/Makefile
 ,38 → 26,29
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-## Include configuration
+## Make some default assumptions
 #
--include Makefile.config
+ifndef ARCH
+    ARCH = ia32
+endif
-DIRS = \
+SOURCES = \
     libc \
     init \
     softfloat
-BUILDS := $(addsuffix .build,$(DIRS))
-CLEANS := $(addsuffix .clean,$(DIRS))
+CLEANS := $(addsuffix .clean,$(SOURCES))
-.PHONY: all config build $(BUILDS) $(CLEANS) clean distclean
+.PHONY: all $(SOURCES) $(CLEANS) clean
-all:
-    tools/config.py default $(ARCH)
-    $(MAKE) -C . build
+all: $(SOURCES)
-config:
-    tools/config.py
-build: $(BUILDS)
 clean: $(CLEANS)
     find $(SOURCES) -name '*.o' -follow -exec rm \{\} \;
-distclean: clean
-    -rm Makefile.config
 $(CLEANS):
     $(MAKE) -C $(basename $@) clean ARCH=$(ARCH)
-$(BUILDS):
-    $(MAKE) -C $(basename $@) all ARCH=$(ARCH)
+$(SOURCES):
+    $(MAKE) -C $@ all ARCH=$(ARCH)