4 files changed, 178 insertions, 251 deletions

diff --git a/.gitignore b/.gitignore
index f420aa3..7f419d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,11 @@
 *.o
 *.a
 
+
+
 # generated files
-tests/__test_catalog.inc
+tests/test_catalog.inc
+*.d
 
 # executables
 runtests
@@ -20,8 +23,5 @@ rtspin
 cycles
 measure_syscall
 
-# scons files
-.sconsign.dblite
-.sconf_temp/*
-config.log
+# build system files
 .config
diff --git a/Makefile b/Makefile
index bb8fffa..5a86b33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,176 @@
-.PHONY: all-32 all-64 all-sparc clean purge
+# figure out what kind of host we are running on
+host-arch := $(shell uname -m | \
+        sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/)
 
-all-32:
-        echo "Legacy warning: Building is done with scons."
-        ARCH=x86 scons
-all-64:
-        ARCH=x86_64 scons
+# ##############################################################################
+# User variables
 
-all-sparc:
-        ARCH=sparc64 scons
+# user variables can be specified in the environment or in a .config file
+-include .config
+
+# ARCH -- what architecture are we compiling for?
+ARCH ?= ${host-arch}
+
+# LITMUS_KERNEL -- where to find the litmus kernel?
+LITMUS_KERNEL ?= ../litmus2010
+
+
+# ##############################################################################
+# Internal configuration.
+
+# compiler flags
+flags-debug    = -Wall -g -Wdeclaration-after-statement
+flags-api      = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE
+flags-link-rt  = -static
+
+# architecture-specific flags
+flags-i386     = -m32
+flags-x86_64   = -m64
+flags-sparc64  = -mcpu=v9 -m64
+# default: none
+
+# name of the directory that has the arch headers in the Linux source
+include-i386     = x86
+include-x86_64   = x86
+include-sparc64  = sparc
+# default: the arch name
+include-${ARCH} ?= ${ARCH}
+
+# where to find header files
+headers = -Iinclude \
+        -I${LITMUS_KERNEL}/include/ \
+        -I${LITMUS_KERNEL}/arch/${include-${ARCH}}/include
+
+# combine options
+CPPFLAGS = ${flags-api} ${flags-${ARCH}} ${headers}
+CFLAGS   = ${flags-debug}
+LDFLAGS  = ${flags-${ARCH}}
+
+# how to link against liblitmus
+liblitmus-flags = -L. -llitmus
+
+# Force gcc instead of cc, but let the user specify a more specific version if
+# desired.
+ifeq (${CC},cc)
+CC = gcc
+endif
+
+# incorporate cross-compiler (if any)
+CC  := ${CROSS_COMPILE}${CC}
+LD  := ${CROSS_COMPILE}${LD}
+AR  := ${CROSS_COMPILE}${AR}
+
+# ##############################################################################
+# Targets
+
+all     = lib ${rt-apps}
+rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
+          base_mt_task runtests
+
+.PHONY: all lib clean dump-config
+
+all: ${all}
+
+dump-config:
+        @echo Build configuration:
+        @printf "%-15s= %-20s\n" \
+                ARCH ${ARCH} \
+                LITMUS_KERNEL "${LITMUS_KERNEL}" \
+                CROSS_COMPILE "${CROSS_COMPILE}" \
+                headers "${headers}" \
+                CFLAGS "${CFLAGS}" \
+                LDFLAGS "${LDFLAGS}" \
+                CPPFLAGS "${CPPFLAGS}" \
+                CC "${CC}" \
+                CPP "${CPP}" \
+                LD "${LD}" \
+                AR "${AR}" \
+                obj-all "${obj-all}"
 
 clean:
-        echo "Legacy warning: Building is now done with scons."
-        scons -c
+        rm -f ${rt-apps}
+        rm -f *.o *.d *.a test_catalog.inc
+
+
+# ##############################################################################
+# liblitmus
+
+lib: liblitmus.a
+
+# all .c file in src/ are linked into liblitmus
+vpath %.c src/
+obj-lib = $(patsubst src/%.c,%.o,$(wildcard src/*.c))
+
+liblitmus.a: ${obj-lib}
+        ${AR} rcs $@ $+
+
+# ##############################################################################
+# Tests suite.
+
+# tests are found in tests/
+vpath %.c tests/
+
+src-runtests = $(wildcard tests/*.c)
+obj-runtests = $(patsubst tests/%.c,%.o,${src-runtests})
+
+# generate list of tests automatically
+test_catalog.inc: $(filter-out tests/runner.c,${src-runtests})
+        tests/make_catalog.py $+ > $@
+
+.SECONDARY: test_catalog.inc
+
+tests/runner.c: test_catalog.inc
+
+
+# ##############################################################################
+# Tools that link with liblitmus
+
+# these source files are found in bin/
+vpath %.c bin/
+
+obj-cycles = cycles.o
+
+obj-base_task = base_task.o
+
+obj-base_mt_task = base_mt_task.o
+ldf-base_mt_task = -pthread
+
+obj-rt_launch = rt_launch.o common.o
+
+obj-rtspin = rtspin.o common.o
+lib-rtspin = -lrt
+
+obj-release_ts = release_ts.o
+
+obj-measure_syscall = null_call.o
+lib-measure_syscall = -lm
+
+# ##############################################################################
+# Build everything that depends on liblitmus.
+
+.SECONDEXPANSION:
+${rt-apps}: $${obj-$$@} liblitmus.a
+        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${lib-$@} ${liblitmus-flags}
+
+# ##############################################################################
+# Dependency resolution.
+
+vpath %.c bin/ src/ tests/
+
+obj-all = ${sort ${foreach target,${all},${obj-${target}}}}
+
+# rule to generate dependency files (straight from make manual)
+%.d: %.c
+        @set -e; rm -f $@; \
+                $(CC) -MM $(CPPFLAGS) $< > $@.$$$$; \
+                sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+                rm -f $@.$$$$
+
+ifeq ($(MAKECMDGOALS),)
+MAKECMDGOALS += all
+endif
+
+ifneq ($(filter-out dump-config clean,$(MAKECMDGOALS)),)
+-include ${obj-all:.o=.d}
+endif
 
-purge: clean
-        rm -rf .sconf_temp .sconsign.dblite
diff --git a/SConstruct b/SConstruct
deleted file mode 100644
index c41e41e..0000000
--- a/SConstruct
+++ /dev/null
@@ -1,232 +0,0 @@
-Help("""
-=============================================
-liblitmus --- The LITMUS^RT Userspace Library
-
-There are a number of user-configurable build
-variables. These can either be set on the
-command line (e.g., scons ARCH=x86) or read
-from a local configuration file (.config).
-
-Run 'scons --dump-config' to see the final
-build configuration.
-
-""")
-
-import os
-(ostype, _, _, _, arch) = os.uname()