[rtems-tools commit] rtk: Build fastlz into the rld library.

[Chris Johns]

Module:    rtems-tools
Branch:    master
Commit:    435d879bb6bdc903bcafc1029bc6337efafe2165
Changeset: http://git.rtems.org/rtems-tools/commit/?id=435d879bb6bdc903bcafc1029bc6337efafe2165

Author:    Chris Johns <chrisj at rtems.org>
Date:      Sat Sep 13 12:26:45 2014 +1000

rtk: Build fastlz into the rld library.

Do not build as an object per program.

---

 linkers/wscript      |    2 +-
 rtemstoolkit/wscript |   19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/linkers/wscript b/linkers/wscript
index 5dd151c..99aa86a 100644
--- a/linkers/wscript
+++ b/linkers/wscript
@@ -50,7 +50,7 @@ def build(bld):
     #
     # The list of modules.
     #
-    modules = ['rld', 'fastlz', 'elf', 'iberty']
+    modules = ['rld', 'elf', 'iberty']
 
     #
     # Build the linker.
diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript
index 80d80ec..544321a 100644
--- a/rtemstoolkit/wscript
+++ b/rtemstoolkit/wscript
@@ -54,7 +54,6 @@ def build(bld):
     # Create each of the modules as object files each with their own
     # configurations.
     #
-    bld_fastlz(bld, conf)
     bld_libelf(bld, conf)
     bld_libiberty(bld, conf)
 
@@ -83,12 +82,19 @@ def build(bld):
     rtems_utils = ['rtems-utils.cpp']
 
     #
+    # Compression.
+    #
+    compression = ['fastlz.c']
+
+    #
     # RTL static library
     #
     bld.stlib(target = 'rld',
               install_path = None,
-              source = rld_source + rtems_utils,
-              defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
+              source = rld_source + rtems_utils + compression,
+              defines = ['HAVE_CONFIG_H=1',
+                         'RTEMS_VERSION=' + bld.env.RTEMS_VERSION,
+                         'FASTLZ_LEVEL=1'],
               includes = ['.'] + conf['includes'],
               cflags = conf['cflags'] + conf['warningflags'],
               cxxflags = conf['cxxflags'] + conf['warningflags'],
@@ -107,13 +113,6 @@ def tags(ctx):
 def conf_libelf(conf):
     pass
 
-def bld_fastlz(bld, conf):
-    bld(target = 'fastlz',
-        features = 'c',
-        source = 'fastlz.c',
-        cflags = conf['cflags'],
-        defines = ['FASTLZ_LEVEL=1'])
-
 def bld_libelf(bld, conf):
     libelf = 'elftoolchain/libelf/'