From 96313a3f6861b1799729e5e788a3d20386554214 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Fri, 20 Nov 2009 03:51:06 +0000 Subject: Include the whole config file in gpsd.h. That is, instead of sectioning out two little config defines and putting them in. This makes gpsd.h self-copntained (e.g. in case it gets installed as a library header) and means we can get rid of most inclusions of it. --- Makefile.am | 6 +++--- Tachometer.c | 1 + ais_json.c | 1 - bits.c | 1 - configure.ac | 4 +++- driver_aivdm.c | 2 -- driver_evermore.c | 1 - driver_italk.c | 1 - driver_navcom.c | 1 - driver_nmea.c | 1 - driver_oncore.c | 1 - driver_proto.c | 1 - driver_rtcm2.c | 1 - driver_rtcm3.c | 1 - driver_sirf.c | 1 - driver_superstar2.c | 1 - driver_ubx.c | 1 - driver_zodiac.c | 1 - drivers.c | 1 - geoid.c | 1 - gpsctl.c | 1 - gpsd.c | 1 + gpsd.h-head | 1 + gpsd.h-tail | 1 + gpsd_json.c | 1 - gpsd_report.c | 1 - gpsdecode.c | 1 - gpsmon.c | 1 + gpspacket.c | 1 - gpspipe.c | 1 - gpsutils.c | 1 - hex.c | 1 - isgps.c | 1 - libgps.c | 1 - libgps_json.c | 1 - libgpsd_core.c | 1 - maskaudit.py | 1 - monitor_italk.c | 1 + monitor_nmea.c | 1 + monitor_oncore.c | 1 + monitor_proto.c | 1 + monitor_sirf.c | 1 + monitor_superstar2.c | 1 + monitor_ubx.c | 1 + net_dgpsip.c | 2 +- net_gnss_dispatch.c | 1 - net_ntrip.c | 3 --- netlib.c | 2 ++ ntpshm.c | 1 - packet.c | 1 - pseudonmea.c | 1 - rtcm2_json.c | 1 - serial.c | 2 ++ srecord.c | 1 - subframe.c | 2 +- test_geoid.c | 4 ++-- test_json.c | 2 +- test_packet.c | 2 +- 58 files changed, 28 insertions(+), 50 deletions(-) diff --git a/Makefile.am b/Makefile.am index e3cb2d44..2e72f1c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -202,8 +202,7 @@ gpsd.h: gpsd.h-head gpsd.h-tail gpsd_config.h rm -f $(srcdir)/gpsd.h echo "/* This file is generated. Do not hand-hack it! */" >gpsd.h cat $(srcdir)/gpsd.h-head >>gpsd.h - grep VERSION gpsd_config.h >>gpsd.h - grep ENABLE gpsd_config.h >>gpsd.h + cat $(srcdir)/gpsd_config.h >>gpsd.h cat $(srcdir)/gpsd.h-tail >>gpsd.h chmod a-w $(srcdir)/gpsd.h @@ -370,7 +369,8 @@ stamp-gps-manpages: gps.xml CLEANFILES += stamp-gps-manpages stamp-gps-manpages.tmp endif -noinst_HEADERS = driver_italk.h driver_rtcm2.h driver_superstar2.h \ +noinst_HEADERS = gpsd_config.h \ + driver_italk.h driver_rtcm2.h driver_superstar2.h \ driver_ubx.h gpsmon.h gpsdclient.h json.h gps_json.h nodist_include_HEADERS = gpsd.h diff --git a/Tachometer.c b/Tachometer.c index 6d8c2622..69ec1340 100644 --- a/Tachometer.c +++ b/Tachometer.c @@ -12,6 +12,7 @@ #include #include #include + #include "gpsd_config.h" #include "gps.h" diff --git a/ais_json.c b/ais_json.c index 2f43444a..53c6b1d9 100644 --- a/ais_json.c +++ b/ais_json.c @@ -16,7 +16,6 @@ representations to libgps structures. #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "gps_json.h" diff --git a/bits.c b/bits.c index de0bf7a2..da125961 100644 --- a/bits.c +++ b/bits.c @@ -12,7 +12,6 @@ #include "bits.h" #ifdef DEBUG #include -#include "gpsd_config.h" #include "gpsd.h" #endif /* DEBUG */ diff --git a/configure.ac b/configure.ac index 8e6e561c..13675554 100644 --- a/configure.ac +++ b/configure.ac @@ -250,7 +250,9 @@ size_t strlcat(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); #endif #ifndef HAVE_STRLCPY size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); -#endif]) +#endif + +#define GPSD_CONFIG_H]) dnl Check for X libraries ac_x="no" diff --git a/driver_aivdm.c b/driver_aivdm.c index 9437da7e..4f04a8a6 100644 --- a/driver_aivdm.c +++ b/driver_aivdm.c @@ -19,9 +19,7 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" - #include "bits.h" /** diff --git a/driver_evermore.c b/driver_evermore.c index 59906171..c39909a0 100644 --- a/driver_evermore.c +++ b/driver_evermore.c @@ -124,7 +124,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(EVERMORE_ENABLE) && defined(BINARY_ENABLE) diff --git a/driver_italk.c b/driver_italk.c index 5efc05dc..7533b104 100644 --- a/driver_italk.c +++ b/driver_italk.c @@ -14,7 +14,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(ITRAX_ENABLE) && defined(BINARY_ENABLE) diff --git a/driver_navcom.c b/driver_navcom.c index a2909b05..f00ad788 100644 --- a/driver_navcom.c +++ b/driver_navcom.c @@ -41,7 +41,6 @@ #include #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) diff --git a/driver_nmea.c b/driver_nmea.c index cf403e86..8f26c832 100644 --- a/driver_nmea.c +++ b/driver_nmea.c @@ -11,7 +11,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "timebase.h" diff --git a/driver_oncore.c b/driver_oncore.c index bf783a73..c869012f 100644 --- a/driver_oncore.c +++ b/driver_oncore.c @@ -12,7 +12,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(ONCORE_ENABLE) && defined(BINARY_ENABLE) diff --git a/driver_proto.c b/driver_proto.c index 607226ca..7a781041 100644 --- a/driver_proto.c +++ b/driver_proto.c @@ -47,7 +47,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(_PROTO__ENABLE) && defined(BINARY_ENABLE) diff --git a/driver_rtcm2.c b/driver_rtcm2.c index 3c10ae3f..cd224692 100644 --- a/driver_rtcm2.c +++ b/driver_rtcm2.c @@ -60,7 +60,6 @@ Starlink's website. #include #include /* for round() */ -#include "gpsd_config.h" #include "gpsd.h" #include "driver_rtcm2.h" diff --git a/driver_rtcm3.c b/driver_rtcm3.c index ce5415ba..a4f5631b 100644 --- a/driver_rtcm3.c +++ b/driver_rtcm3.c @@ -38,7 +38,6 @@ firmware. #include /* for ntohl(3) and friends */ #endif /* S_SPLINT_S */ -#include "gpsd_config.h" #include "gpsd.h" #include "bits.h" diff --git a/driver_sirf.c b/driver_sirf.c index 84e742fe..a4eb791d 100644 --- a/driver_sirf.c +++ b/driver_sirf.c @@ -37,7 +37,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "bits.h" #if defined(SIRF_ENABLE) && defined(BINARY_ENABLE) diff --git a/driver_superstar2.c b/driver_superstar2.c index 31e55dc8..f94f8e04 100644 --- a/driver_superstar2.c +++ b/driver_superstar2.c @@ -11,7 +11,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(SUPERSTAR2_ENABLE) && defined(BINARY_ENABLE) diff --git a/driver_ubx.c b/driver_ubx.c index b97b6fbb..1ec93911 100644 --- a/driver_ubx.c +++ b/driver_ubx.c @@ -16,7 +16,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(UBX_ENABLE) && defined(BINARY_ENABLE) #include "driver_ubx.h" diff --git a/driver_zodiac.c b/driver_zodiac.c index 3c228624..0ae83761 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -10,7 +10,6 @@ #include #endif /* S_SPLINT_S */ #include -#include "gpsd_config.h" #include "gpsd.h" #include "bits.h" diff --git a/drivers.c b/drivers.c index b367e77c..ffa72862 100644 --- a/drivers.c +++ b/drivers.c @@ -12,7 +12,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "bits.h" /* for getbeuw(), to extract big-endiamn words */ diff --git a/geoid.c b/geoid.c index 13f37e40..fa79104d 100644 --- a/geoid.c +++ b/geoid.c @@ -8,7 +8,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" static double fix_minuz(double d); diff --git a/gpsctl.c b/gpsctl.c index 457d6737..9fbf8ecc 100644 --- a/gpsctl.c +++ b/gpsctl.c @@ -16,7 +16,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" static int debuglevel; diff --git a/gpsd.c b/gpsd.c index d9508e8d..187cd778 100644 --- a/gpsd.c +++ b/gpsd.c @@ -27,6 +27,7 @@ #include #include "gpsd_config.h" + #if defined (HAVE_PATH_H) #include #else diff --git a/gpsd.h-head b/gpsd.h-head index 9c1b12fe..a915fe96 100644 --- a/gpsd.h-head +++ b/gpsd.h-head @@ -14,4 +14,5 @@ #endif #include "gps.h" +#ifndef GPSD_CONFIG_H /* Feature configuration switches begin here */ diff --git a/gpsd.h-tail b/gpsd.h-tail index 95b2d9f4..a4a7d10c 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -1,4 +1,5 @@ /* Feature configuration switches end here */ +#endif /* GPSD_CONFIG_H */ /* $Id$ */ diff --git a/gpsd_json.c b/gpsd_json.c index 332a2cc6..f37fb4ea 100644 --- a/gpsd_json.c +++ b/gpsd_json.c @@ -15,7 +15,6 @@ representations to gpsd core strctures, and vice_versa. #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "gps_json.h" diff --git a/gpsd_report.c b/gpsd_report.c index 59b8c382..c97b00e1 100644 --- a/gpsd_report.c +++ b/gpsd_report.c @@ -2,7 +2,6 @@ #include #include #include -#include "gpsd_config.h" #include "gpsd.h" void gpsd_report(int errlevel UNUSED, const char *fmt, ... ) diff --git a/gpsdecode.c b/gpsdecode.c index 939bd9e3..64a264f3 100644 --- a/gpsdecode.c +++ b/gpsdecode.c @@ -11,7 +11,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "gps_json.h" diff --git a/gpsmon.c b/gpsmon.c index 2f0c54b2..6edefa18 100644 --- a/gpsmon.c +++ b/gpsmon.c @@ -27,6 +27,7 @@ #include /* for O_RDWR */ #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/gpspacket.c b/gpspacket.c index 087f6ebc..d6d05fd0 100644 --- a/gpspacket.c +++ b/gpspacket.c @@ -5,7 +5,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" static PyObject *ErrorObject = NULL; diff --git a/gpspipe.c b/gpspipe.c index 7e1cc219..9cf88aa1 100644 --- a/gpspipe.c +++ b/gpspipe.c @@ -36,7 +36,6 @@ #include #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "gpsdclient.h" diff --git a/gpsutils.c b/gpsutils.c index 90ce6bd6..ed45c888 100644 --- a/gpsutils.c +++ b/gpsutils.c @@ -11,7 +11,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #define MONTHSPERYEAR 12 /* months per calendar year */ diff --git a/hex.c b/hex.c index abdc1541..61b95d34 100644 --- a/hex.c +++ b/hex.c @@ -7,7 +7,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" int gpsd_hexdump_level = -1; diff --git a/isgps.c b/isgps.c index 28c76293..7b7bbcb1 100644 --- a/isgps.c +++ b/isgps.c @@ -64,7 +64,6 @@ You are not expected to understand any of this. #include #include -#include "gpsd_config.h" #include "gpsd.h" #define MAG_SHIFT 6u diff --git a/libgps.c b/libgps.c index 44660ecb..1f6c0a56 100644 --- a/libgps.c +++ b/libgps.c @@ -15,7 +15,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "gps_json.h" diff --git a/libgps_json.c b/libgps_json.c index 2d519562..af85a4f0 100644 --- a/libgps_json.c +++ b/libgps_json.c @@ -15,7 +15,6 @@ representations to libgps structures. #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "gps_json.h" diff --git a/libgpsd_core.c b/libgpsd_core.c index c38f38ee..7a4a9f56 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -17,7 +17,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #if defined(PPS_ENABLE) && defined(TIOCMIWAIT) diff --git a/maskaudit.py b/maskaudit.py index 544ec9e2..380fbe95 100755 --- a/maskaudit.py +++ b/maskaudit.py @@ -66,7 +66,6 @@ if __name__ == '__main__': #include #include -#include \"gpsd_config.h\" /* for strlcat() */ #include \"gpsd.h\" const char *gpsd_maskdump(gps_mask_t set) diff --git a/monitor_italk.c b/monitor_italk.c index f2c3dd63..09d6f996 100644 --- a/monitor_italk.c +++ b/monitor_italk.c @@ -12,6 +12,7 @@ #include #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/monitor_nmea.c b/monitor_nmea.c index b109263f..e7c00735 100644 --- a/monitor_nmea.c +++ b/monitor_nmea.c @@ -18,6 +18,7 @@ #include #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/monitor_oncore.c b/monitor_oncore.c index 5cc5bfec..7000864c 100644 --- a/monitor_oncore.c +++ b/monitor_oncore.c @@ -15,6 +15,7 @@ #include #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/monitor_proto.c b/monitor_proto.c index 1b20da9f..21e43a38 100644 --- a/monitor_proto.c +++ b/monitor_proto.c @@ -15,6 +15,7 @@ #include #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/monitor_sirf.c b/monitor_sirf.c index 4357f4ee..685ee592 100644 --- a/monitor_sirf.c +++ b/monitor_sirf.c @@ -16,6 +16,7 @@ #include #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/monitor_superstar2.c b/monitor_superstar2.c index 50e64ff6..bf9d4ed6 100644 --- a/monitor_superstar2.c +++ b/monitor_superstar2.c @@ -12,6 +12,7 @@ #include #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/monitor_ubx.c b/monitor_ubx.c index 98419c5f..6d32d05e 100644 --- a/monitor_ubx.c +++ b/monitor_ubx.c @@ -12,6 +12,7 @@ #include #include "gpsd_config.h" + #ifdef HAVE_NCURSES_H #include #else diff --git a/net_dgpsip.c b/net_dgpsip.c index abf14539..e771e5ec 100644 --- a/net_dgpsip.c +++ b/net_dgpsip.c @@ -15,7 +15,7 @@ #include #include #include -#include "gpsd_config.h" + #include "gpsd.h" /*@ -branchstate */ diff --git a/net_gnss_dispatch.c b/net_gnss_dispatch.c index 78f58618..c631b4f5 100644 --- a/net_gnss_dispatch.c +++ b/net_gnss_dispatch.c @@ -9,7 +9,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #define NETGNSS_DGPSIP "dgpsip://" diff --git a/net_ntrip.c b/net_ntrip.c index 662b674e..2ccd2537 100644 --- a/net_ntrip.c +++ b/net_ntrip.c @@ -15,9 +15,7 @@ #include #include #include -#include "gpsd_config.h" -#ifdef NTRIP_ENABLE #include "gpsd.h" #include "bsd-base64.h" @@ -474,4 +472,3 @@ void ntrip_report(struct gps_device_t *session) } } } -#endif /* NTRIP_ENABLE */ diff --git a/netlib.c b/netlib.c index 573d609f..be5c765a 100644 --- a/netlib.c +++ b/netlib.c @@ -1,6 +1,8 @@ /* $Id$ */ #include + #include "gpsd_config.h" + #ifndef S_SPLINT_S #ifdef HAVE_SYS_SOCKET_H #include diff --git a/ntpshm.c b/ntpshm.c index 60631dca..be387ea9 100644 --- a/ntpshm.c +++ b/ntpshm.c @@ -15,7 +15,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" #ifdef NTPSHM_ENABLE diff --git a/packet.c b/packet.c index 2291621a..f3463673 100644 --- a/packet.c +++ b/packet.c @@ -37,7 +37,6 @@ others apart and distinguish them from baud barf. #include /* for htons() */ #endif /* S_SPLINT_S */ -#include "gpsd_config.h" #include "bits.h" #include "gpsd.h" #include "crc24q.h" diff --git a/pseudonmea.c b/pseudonmea.c index fe9b04c6..8c396e17 100644 --- a/pseudonmea.c +++ b/pseudonmea.c @@ -15,7 +15,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" /* diff --git a/rtcm2_json.c b/rtcm2_json.c index fac27f29..f10df591 100644 --- a/rtcm2_json.c +++ b/rtcm2_json.c @@ -15,7 +15,6 @@ representations to libgps structures. #include #include -#include "gpsd_config.h" #include "gpsd.h" #include "gps_json.h" diff --git a/serial.c b/serial.c index e6e196e3..647bf30c 100644 --- a/serial.c +++ b/serial.c @@ -13,7 +13,9 @@ #if defined(HAVE_SYS_MODEM_H) #include #endif /* HAVE_SYS_MODEM_H */ + #include "gpsd.h" + /* Workaround for HP-UX 11.23, which is missing CRTSCTS */ #ifndef CRTSCTS # ifdef CNEW_RTSCTS diff --git a/srecord.c b/srecord.c index 4c80c712..1cfdbf02 100644 --- a/srecord.c +++ b/srecord.c @@ -18,7 +18,6 @@ #include #include -#include "gpsd_config.h" #include "gpsd.h" /* diff --git a/subframe.c b/subframe.c index 03fd900a..7b2633a4 100644 --- a/subframe.c +++ b/subframe.c @@ -1,7 +1,7 @@ /* $Id$ */ /* subframe.c -- interpret satellite subframe data. */ #include -#include "gpsd_config.h" + #include "gpsd.h" #if 0 diff --git a/test_geoid.c b/test_geoid.c index 5db55019..c3566689 100644 --- a/test_geoid.c +++ b/test_geoid.c @@ -6,11 +6,11 @@ #include #include -#include "gpsd_config.h" -#include "gpsd.h" #include #include +#include "gpsd.h" + int main(int argc, char **argv) { double lat, lon; diff --git a/test_json.c b/test_json.c index 472b07b7..e34f004a 100644 --- a/test_json.c +++ b/test_json.c @@ -6,7 +6,7 @@ #include #include #include -#include "gpsd_config.h" + #include "gpsd.h" #include "gps_json.h" diff --git a/test_packet.c b/test_packet.c index abe7ac1e..30decee6 100644 --- a/test_packet.c +++ b/test_packet.c @@ -8,7 +8,7 @@ #ifndef S_SPLINT_S #include #endif /* S_SPLINT_S */ -#include "gpsd_config.h" + #include "gpsd.h" static int verbose = 0; -- cgit v1.2.1