gpsd-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gpsd-dev] [PATCH 1/2] ntpshmread.c is not used by libgps


From: Robert Norris
Subject: [gpsd-dev] [PATCH 1/2] ntpshmread.c is not used by libgps
Date: Tue, 14 Feb 2017 21:30:17 +0000

This is to make Windows build of libgps easier as Windows doesn't support
sys/ipc.h and sys/shm.h.

Shift to be included in libgpsd instead.
Thus ntpshmmon now requires the libgpsd.

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

diff --git a/SConstruct b/SConstruct
index bc7ba644..1de0fa75 100644
--- a/SConstruct
+++ b/SConstruct
@@ -986,7 +986,6 @@ libgps_sources = [
     "libgps_shm.c",
     "libgps_sock.c",
     "netlib.c",
-    "ntpshmread.c",
     "os_compat.c",
     "rtcm2_json.c",
     "rtcm3_json.c",
@@ -1007,6 +1006,7 @@ libgpsd_sources = [
     "net_dgpsip.c",
     "net_gnss_dispatch.c",
     "net_ntrip.c",
+    "ntpshmread.c",
     "ntpshmwrite.c",
     "ppsthread.c",
     "packet.c",
@@ -1161,7 +1161,7 @@ cgps = env.Program('cgps', ['cgps.c'],
                    LIBS=['gps_static'],
                    parse_flags=gpsflags + ncurseslibs)
 ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
-                        LIBS=['gps_static'],
+                        LIBS=['gpsd', 'gps_static'],
                         parse_flags=gpsflags)
 ppscheck = env.Program('ppscheck', ['ppscheck.c'],
                         parse_flags=gpsflags)
-- 
2.11.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]