From 901bfe301956707a971c45a589e3892247baacaf Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 23 Mar 2015 00:19:46 -0400 Subject: [PATCH] Build simplification - stop installing libgpsd in system space. gpsd.h hasn't been installed in /usr/include for many releases now, so this was a historical vestige anyway. All regression tests pass. --- SConstruct | 15 +--- libgpsd.xml | 144 ------------------------------------- packaging/rpm/gpsd.spec.in | 5 +- www/index.html.in | 3 - 4 files changed, 6 insertions(+), 161 deletions(-) delete mode 100644 libgpsd.xml diff --git a/SConstruct b/SConstruct index 5f52057f..1cab97fa 100644 --- a/SConstruct +++ b/SConstruct @@ -26,13 +26,10 @@ # Release identification begins here gpsd_version = "3.15~dev" -# library version +# client library version libgps_version_current = 22 libgps_version_revision = 0 libgps_version_age = 0 -libgpsd_version_current = 22 -libgpsd_version_revision = 0 -libgpsd_version_age = 0 # Release identification ends here @@ -848,8 +845,6 @@ int clock_gettime(clockid_t, struct timespec *); libgps_version_soname = libgps_version_current - libgps_version_age libgps_version = "%d.%d.%d" %(libgps_version_soname, libgps_version_age, libgps_version_revision) -libgpsd_version_soname = libgpsd_version_current - libgpsd_version_age -libgpsd_version = "%d.%d.%d" %(libgpsd_version_soname, libgpsd_version_age, libgpsd_version_revision) libgps_sources = [ "ais_json.c", @@ -1016,10 +1011,8 @@ compiled_gpslib = Library(env=env, parse_flags=rtlibs) env.Clean(compiled_gpslib, "gps_maskdump.c") -compiled_gpsdlib = Library(env=env, - target="gpsd", - sources=libgpsd_sources, - version=libgpsd_version, +compiled_gpsdlib = env.StaticLibrary(target="gpsd", + source=libgpsd_sources, parse_flags=usblibs + rtlibs + bluezlibs + ["-lgps"]) libraries = [compiled_gpslib, compiled_gpsdlib] @@ -1357,7 +1350,6 @@ base_manpages = { "libgps.3" : "libgps.xml", "libgpsmm.3" : "libgpsmm.xml", "libQgpsmm.3" : "libgpsmm.xml", - "libgpsd.3" : "libgpsd.xml", "gpsmon.1": "gpsmon.xml", "gpsctl.1" : "gpsctl.xml", "gpsdctl.8" : "gpsdctl.xml", @@ -1412,7 +1404,6 @@ binaryinstall.append(env.Install(installdir('bindir'), [gpsdecode, gpsctl, gpsp if env["ncurses"]: binaryinstall.append(env.Install(installdir('bindir'), [cgps, gpsmon])) binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib)) -binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpsdlib)) if qt_env: binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib)) diff --git a/libgpsd.xml b/libgpsd.xml deleted file mode 100644 index 3b56c946..00000000 --- a/libgpsd.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - -14 Aug 2004 - -3 -3 -The GPSD Project -GPSD Documentation - - -libgpsd -service library for GPS applications - - - - -C: - -#include <gpsd.h> - - - - - -int gpsd_open_dgps - char * dgpsserver - - -void gpsd_init - struct gps_device_t *session - struct * gps_context_t * - char * device - - -int gpsd_activate - struct gps_device_t *session - - -void gpsd_deactivate - struct gps_device_t * session - - -gps_mask_t gpsd_poll - struct gps_device_t * session - - -void gpsd_wrap - struct gps_device_t * session - - - - -DESCRIPTION -libgpsd -is a service library which supports querying GPS devices; link it with -the linker option -lgpsd. It is a set of low-level -device-handling calls, which -gpsd1 -itself uses. See -gpsd3 -for a description of the high-level interface, which is almost -certainly what you want. - -Calling -gpsd_init() -initializes a session structure to hold the data collected by the GPS. - -The second argument must be a context structure. The library -will use it for information that need to be shared between sessions; -presently this includes the leap-second correction and possibly a -pointer to a shared-memory segment used to communicate with the -Network Time Protocol daemon. - -After the session structure has been set up, you may modify some -of its members. - - - -gpsd_device - -This member should hold the path name of the device. - - - -baudrate - -Communication speed in bits per second. For NMEA or SiRF devices, the -library automatically hunts through all plausible baud rates, stopping -on the one where it sees valid packets. By setting this field you can -designate a speed to be tried at the front of the hunt queue - - - - -gpsd_activate() -initializes the connection to the GPS. -gpsd_deactivate() -closes the connection. These functions are provided so that -long-running programs can release a connection when there is no -activity requiring the GPS, and re-acquire it later. - -gpsd_poll() -queries the GPS and updates the part of the session structure that -holds position, speed, GPS signal quality, and other data returned -by the GPS. It returns a mask describing which fields have changed. - -gpsd_wrap() -ends the session, implicitly performing a -gpsd_deactivate(). - -The low-level functions do not allocate or free any dynamic -storage. They can thus be used in a long-running application (such as -gpsd8 -itself) with a guarantee that they won't cause memory leaks. - - - -BUGS - -Writes to the context structure members are not guarded by -a mutex. - - - -SEE ALSO - -gpsd8, -gps1, -libgps3. - - - -AUTHOR -Eric S. Raymond <esr@thyrsus.com> based partly on earlier work by -Remco Treffkorn, Derrick Brashear, and Russ Nelson. - - - diff --git a/packaging/rpm/gpsd.spec.in b/packaging/rpm/gpsd.spec.in index 3a4aa454..46af8210 100644 --- a/packaging/rpm/gpsd.spec.in +++ b/packaging/rpm/gpsd.spec.in @@ -234,11 +234,9 @@ fi %{python_sitearch}/gps/fake* %{_includedir}/gps.h %{_includedir}/libgpsmm.h -#%{_includedir}/gpsd.h %{_mandir}/man1/gpsfake.1* %{_mandir}/man3/libgps.3* %{_mandir}/man3/libgpsmm.3* -%{_mandir}/man3/libgpsd.3* %{_mandir}/man5/srec.5* %files -n libQgpsmm @@ -284,6 +282,9 @@ fi %attr(0755,root,root) %{_var}/www/html/gpsd/pgps.cgi %changelog +* Mon Mar 23 00:11:00 EDT 2015Eric S. Raymond 3.15-1 +- We no longer export libgpsd. + * Sun Jul 31 2011 Michael R. Davis 3.0-2 - Added gegps, gpsdctl - Dropped hotplug wrapper diff --git a/www/index.html.in b/www/index.html.in index 9632afca..24f0e093 100644 --- a/www/index.html.in +++ b/www/index.html.in @@ -268,9 +268,6 @@ latest stable version.

libgpsmm.3
C++ class wrapper for the libgps C binding.
-
libgpsd.3
-
The low-level library used by gpsd to talk to a GPS.
-
gpsprof.1
The gpsprof program for plotting spatial scatter of fixes and fix latency.