From 30375bbdffa1cea6ea5a847975180f0333db6ce4 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sun, 27 May 2012 10:40:19 -0400 Subject: [PATCH] build: Compile libsaria using an Sconscript file To extract libsaria-related stuff from the main build script. Signed-off-by: Bryan Schumaker --- Sconstruct | 13 ++----------- libsaria/Sconscript | 12 ++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 libsaria/Sconscript diff --git a/Sconstruct b/Sconstruct index 3f6e2249..c7b4576d 100644 --- a/Sconstruct +++ b/Sconstruct @@ -26,26 +26,17 @@ if ARGUMENTS.get('VERBOSE') != "1": env.Append(LINKCOMSTR = "Linking $TARGET") env.Append(CPPPATH = "include") -env.ParseConfig('pkg-config --cflags --libs gstreamer-0.10') -env.ParseConfig('pkg-config --cflags --libs gstreamer-interfaces-0.10') -env.ParseConfig('pkg-config --cflags --libs taglib') - Export("env", "MAJOR", "MINOR", "BUG", "EXTRA") -def use_dirs(dirs): +def directory(dirs): objs = [] for dir in dirs: files = SConscript("%s/Sconscript" % dir) objs.append(files) return objs -def list_dirs(directory): - import os - dirs = [x[0] for x in os.walk(directory)] - return [Glob(dir + "/*.cpp") for dir in dirs] - -ocarina=env.Program('ocarina.bin', list_dirs('libsaria') + use_dirs(["ocarina"])) SConscript(['include/Sconscript']) +ocarina=env.Program('ocarina.bin', directory(["libsaria", "ocarina"])) Default([ocarina]) # Install Ocarina diff --git a/libsaria/Sconscript b/libsaria/Sconscript new file mode 100644 index 00000000..086cdcdc --- /dev/null +++ b/libsaria/Sconscript @@ -0,0 +1,12 @@ +#!/usr/bin/python +import os +Import('env') + +env.ParseConfig('pkg-config --cflags --libs gstreamer-0.10') +env.ParseConfig('pkg-config --cflags --libs gstreamer-interfaces-0.10') +env.ParseConfig('pkg-config --cflags --libs taglib') + +dirs = [x[0] for x in os.walk(".")] +files = [Glob(dir + "/*.cpp") for dir in dirs] + +Return('files')