Remove a header that no longer fits the way we've organized the export APIs.

Also, tweak a configuration test and fix some docs.

5 files changed, 14 insertions, 22 deletions

diff --git a/HACKING b/HACKING
index df5f3a6e..e9352abc 100644
--- a/HACKING
+++ b/HACKING
@@ -3,6 +3,6 @@ this file is on the website:
 
   http://gpsd.berlios.de/hacking.html
 
-and therefore also in the sources as:
+and therefore also in the repository as:
 
   www/hacking.html
diff --git a/Makefile.am b/Makefile.am
index e355b1f3..9db4de0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,7 @@ gpxlogger_LDADD = $(DBUS_GLIB_LIBS) libgps.la $(LIBM)
 # Build gpsd
 #
 gpsd_c_sources = gpsd.c dbusexport.c shmexport.c ntpshm.c
-gpsd_SOURCES = $(gpsd_c_sources) dbusexport.h
+gpsd_SOURCES = $(gpsd_c_sources)
 gpsd_LDADD = libgpsd.la libgps.la $(LIBM) $(LIBPTHREAD) $(LIBUSB_LIBS) $(BLUEZ_LIBS) $(DBUS_LIBS) $(LIBM)
 
 #
diff --git a/SConstruct b/SConstruct
index fa8dc257..b0ea8fbe 100644
--- a/SConstruct
+++ b/SConstruct
@@ -262,7 +262,8 @@ def CheckXsltproc(context):
     probe = "xsltproc --nonet --noout '%s' xmltest.xml" % (docbook_man_uri,)
     ret = context.TryAction(probe)[0]
     os.remove("xmltest.xml")
-    os.remove("foo.1")
+    if os.path.exists("foo.1"):
+        os.remove("foo.1")
     context.Result( ret )
     return ret
 
diff --git a/dbusexport.h b/dbusexport.h
deleted file mode 100644
index 0206dd12..00000000
--- a/dbusexport.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file is Copyright (c) 2010 by the GPSD project
- * BSD terms apply: see the file COPYING in the distribution root for details.
- */
-#ifndef _GPSD_DBUS_H_
-#define _GPSD_DBUS_H_
-
-#if defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S)
-
-#include <dbus/dbus.h>
-
-#include "gpsd.h"
-
-int initialize_dbus_connection (void);
-void send_dbus_fix (struct gps_device_t* channel);
-
-#endif /* defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S) */
-
-#endif /* _GPSD_DBUS_H_ */
diff --git a/gpsd.h-tail b/gpsd.h-tail
index bda23eeb..0b266f63 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -705,6 +705,16 @@ extern bool shm_acquire(struct gps_context_t *);
 extern void shm_release(struct gps_context_t *);
 extern void shm_update(struct gps_context_t *, struct gps_data_t *);
 
+
+/* dbusexport.c */
+#if defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S)
+#include <dbus/dbus.h>
+
+int initialize_dbus_connection (void);
+void send_dbus_fix (struct gps_device_t* channel);
+
+#endif /* defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S) */
+
 /* srecord.c */
 extern void hexdump(size_t, unsigned char *, unsigned char *);
 extern unsigned char sr_sum(unsigned int, unsigned int, unsigned char *);