From 80d5707c53fbd04ffafc28eb7db2889929ccda9b Mon Sep 17 00:00:00 2001 From: Fred Wright Date: Fri, 9 Sep 2016 14:15:17 -0700 Subject: [PATCH 3/5] Adds explicit recipe for strl "library" in contrib/. Although this is a don't-care for the current setup, if a "library- like" object is included as a source for multiple programs with different flag settings, SCons warns about building the same object with different environments. Building such objects separately avoids that. TESTED: Programs still build on OSX. --- contrib/SConstruct | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/SConstruct b/contrib/SConstruct index 6c3f4ec..2cfa86e 100644 --- a/contrib/SConstruct +++ b/contrib/SConstruct @@ -5,10 +5,12 @@ # Note that ../gpsd_config.h is required and not built automatically. -ashctl = Program("ashctl", ["ashctl.c", "../strl.c"]) +strl = StaticObject("strl", "../strl.c") + +ashctl = Program("ashctl", ["ashctl.c", strl]) binlog = Program("binlog", "binlog.c") binreplay = Program("binreplay", "binreplay.c", parse_flags=['-lutil']) lla2ecef = Program("lla2ecef", "lla2ecef.c", parse_flags=['-lm']) -motosend = Program("motosend", ["motosend.c", "../strl.c"]) +motosend = Program("motosend", ["motosend.c", strl]) Default(ashctl, binlog, binreplay, lla2ecef, motosend) -- 2.9.3