switch ft_tools to liblitmus-generated Makefile

The liblitmus Makefile generates a config.inc makefile that makes the
liblitmus configuration available to third-party projects. This commit
switches ft_tools from the old SConstruct (which did all the
configuration itself to a much simpler Makefile based on including
config.inc.

As a new feature, this automatically picks up all compiler options
from liblitmus and thus automatically supports cross-compilation.

2 files changed, 40 insertions, 52 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..afff4dc
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,40 @@
+# ##############################################################################
+# User variables
+
+# user variables can be specified in the environment or in a .config file
+-include .config
+
+# Where is the LITMUS^RT userspace library source tree?
+LIBLITMUS ?= ../liblitmus2010
+
+# Include default configuration from liblitmus
+# Liblitmus must have been built before ft_tools can be built.
+include ${LIBLITMUS}/inc/config.makefile
+
+# all sources
+vpath %.c src/
+
+# local include files
+CPPFLAGS += -Iinclude/
+
+# ##############################################################################
+# Targets
+
+all = ftcat ft2csv ftdump
+
+.PHONY: all clean
+all: ${all}
+clean:
+        rm -f ${all} *.o *.d
+
+obj-ftcat = ftcat.o timestamp.o
+ftcat: ${obj-ftcat}
+
+obj-ft2csv  = ft2csv.o timestamp.o mapping.o
+ft2csv: ${obj-ft2csv}
+
+obj-ftdump  = ftdump.o timestamp.o mapping.o
+ftdump: ${obj-ftdump}
+
+# dependency discovery
+include ${LIBLITMUS}/inc/depend.makefile
diff --git a/SConstruct b/SConstruct
deleted file mode 100644
index 97b5761..0000000
--- a/SConstruct
+++ /dev/null
@@ -1,52 +0,0 @@
-# #####################################################################
-# User configuration: Nothing to configure in this version.
-
-# #####################################################################
-# Internal configuration.
-DEBUG_FLAGS  = '-Wall -g -Wdeclaration-after-statement'
-INCLUDE_DIRS = 'include/'
-X86_32_FLAGS = '-m32'
-X86_64_FLAGS = '-m64'
-V9_FLAGS     = '-mcpu=v9 -m64'
-SUPPORTED_ARCHS = {
-    'sparc64' : V9_FLAGS,
-    'i686'    : X86_32_FLAGS,
-    'i386'    : X86_32_FLAGS,
-    'x86_64'  : X86_64_FLAGS,
-}
-# #####################################################################
-# Build configuration.
-from os import uname, environ
-
-# sanity check
-(os, _, _, _, arch) = uname()
-if os != 'Linux':
-    print 'Error: Building ft_tools is only supported on Linux.'
-    Exit(1)
-
-# override arch if ARCH is set in environment or command line
-if 'ARCH' in ARGUMENTS:
-    arch = ARGUMENTS['ARCH']
-elif 'ARCH' in environ:
-    arch = environ['ARCH']
-
-if arch not in SUPPORTED_ARCHS:
-    print 'Error: Building ft_tools is only supported for the following', \
-        'architectures: %s.' % ', '.join(sorted(SUPPORTED_ARCHS))
-    Exit(1)
-else:
-    print 'Building %s binaries.' % arch
-    arch_flags = Split(SUPPORTED_ARCHS[arch])
-
-env = Environment(
-    CC = 'gcc',
-    CPPPATH = Split(INCLUDE_DIRS),
-    CCFLAGS = Split(DEBUG_FLAGS) + arch_flags,
-    LINKFLAGS = arch_flags,
-)
-
-# #####################################################################
-# Targets:
-env.Program('ftcat', ['src/ftcat.c', 'src/timestamp.c'])
-env.Program('ft2csv', ['src/ft2csv.c', 'src/timestamp.c', 'src/mapping.c'])
-env.Program('ftdump', ['src/ftdump.c', 'src/timestamp.c', 'src/mapping.c'])