[gpsd-dev] [PATCH] ntpshmread.c and daemon.c files are not used by libgps

[Rob Norris]

Shift to be included in libgpsd instead thus several internal clients now 
include libgpsd.
daemon.c is by used by several, but not all clients.
ATM ntpshmread.c is only used by ntpshmmon, but could be used by other clients.

TESTED:
'scons build-all check' passes
---
 SConstruct | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index c268791..0d187fe 100644
--- a/SConstruct
+++ b/SConstruct
@@ -873,7 +873,6 @@ libgps_sources = [
     "ais_json.c",
     "bits.c",
     "clock_gettime.c",
-    "daemon.c",
     "gpsutils.c",
     "gpsdclient.c",
     "gps_maskdump.c",
@@ -885,7 +884,6 @@ libgps_sources = [
     "libgps_shm.c",
     "libgps_sock.c",
     "netlib.c",
-    "ntpshmread.c",
     "rtcm2_json.c",
     "rtcm3_json.c",
     "shared_json.c",
@@ -898,6 +896,7 @@ if env['libgpsmm']:
 libgpsd_sources = [
     "bsd_base64.c",
     "crc24q.c",
+    "daemon.c",
     "gpsd_json.c",
     "geoid.c",
     "isgps.c",
@@ -906,6 +905,7 @@ libgpsd_sources = [
     "net_dgpsip.c",
     "net_gnss_dispatch.c",
     "net_ntrip.c",
+    "ntpshmread.c",
     "ntpshmwrite.c",
     "ppsthread.c",
     "packet.c",
@@ -1044,13 +1044,13 @@ gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'],
                       LIBS=['gps_static'], LIBPATH='.',
                       parse_flags=gpsflags)
 gpspipe = env.Program('gpspipe', ['gpspipe.c'],
-                      LIBS=['gps_static'], LIBPATH='.',
+                      LIBS=['gpsd', 'gps_static'], LIBPATH='.',
                       parse_flags=gpsflags)
 gps2udp = env.Program('gps2udp', ['gps2udp.c'],
-                      LIBS=['gps_static'], LIBPATH='.',
+                      LIBS=['gpsd', 'gps_static'], LIBPATH='.',
                       parse_flags=gpsflags)
 gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'],
-                        LIBS=['gps_static'], LIBPATH='.',
+                        LIBS=['gpsd', 'gps_static'], LIBPATH='.',
                         parse_flags=gpsflags)
 lcdgps = env.Program('lcdgps', ['lcdgps.c'],
                      LIBS=['gps_static'], LIBPATH='.',
@@ -1059,7 +1059,7 @@ cgps = env.Program('cgps', ['cgps.c'],
                    LIBS=['gps_static'], LIBPATH='.',
                    parse_flags=gpsflags + ncurseslibs)
 ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
-                        LIBS=['gps_static'], LIBPATH='.',
+                        LIBS=['gpsd', 'gps_static'], LIBPATH='.',
                         parse_flags=gpsflags)
 
 binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, 
lcdgps, ntpshmmon]
-- 
2.7.0