Skip to content

Commit

Permalink
ntpshmread.c is not used by libgps
Browse files Browse the repository at this point in the history
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

Signed-off-by: Fred Wright <[email protected]>
  • Loading branch information
rnorris authored and fhgwright committed Feb 17, 2017
1 parent b139396 commit b8890ec
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -1007,6 +1006,7 @@ libgpsd_sources = [
"net_dgpsip.c",
"net_gnss_dispatch.c",
"net_ntrip.c",
"ntpshmread.c",
"ntpshmwrite.c",
"ppsthread.c",
"packet.c",
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b8890ec

Please sign in to comment.