diff options
| author | Jon Schlueter <jon.schlueter@gmail.com> | 2011-04-04 07:08:03 -0400 |
|---|---|---|
| committer | Jon Schlueter <jon.schlueter@gmail.com> | 2011-04-04 09:08:43 -0400 |
| commit | 344e23b54551466fca9f05435a687f62e1305616 (patch) | |
| tree | f08552e773df62b84554e6ffea5cb8ed886b21a3 | |
| parent | 3dd38786fb76f8063ecd073cd5fc32aba0e85480 (diff) | |
| download | gpsd-344e23b54551466fca9f05435a687f62e1305616.tar.gz | |
finish renaming gpsd_dbus to dbusexport
renamed gpsd_dbus.h to dbusexport.h
renamed internals of doc/* to point at dbusexport instead of gpsd_dbus
updated gpsd.c and dbusexport.c to use dbusexport.h
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | dbusexport.c | 2 | ||||
| -rw-r--r-- | dbusexport.h (renamed from gpsd_dbus.h) | 0 | ||||
| -rw-r--r-- | doc/explan_dbusexport.c.xml (renamed from doc/explan_gpsd_dbus.c.xml) | 2 | ||||
| -rw-r--r-- | doc/explanation.xml | 4 | ||||
| -rw-r--r-- | gpsd.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 71860dc5..9986a295 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) gpsd_dbus.h +gpsd_SOURCES = $(gpsd_c_sources) dbusexport.h gpsd_LDADD = libgpsd.la libgps.la $(LIBM) $(LIBPTHREAD) $(LIBUSB_LIBS) $(BLUEZ_LIBS) $(DBUS_LIBS) $(LIBM) # diff --git a/dbusexport.c b/dbusexport.c index b04fb827..8cf3ed06 100644 --- a/dbusexport.c +++ b/dbusexport.c @@ -5,7 +5,7 @@ #include <sys/types.h> #include "gpsd_config.h" #if defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S) -#include "gpsd_dbus.h" +#include "dbusexport.h" static DBusConnection *connection = NULL; diff --git a/gpsd_dbus.h b/dbusexport.h index 0206dd12..0206dd12 100644 --- a/gpsd_dbus.h +++ b/dbusexport.h diff --git a/doc/explan_gpsd_dbus.c.xml b/doc/explan_dbusexport.c.xml index 72c8381d..6cf18e3d 100644 --- a/doc/explan_gpsd_dbus.c.xml +++ b/doc/explan_dbusexport.c.xml @@ -1,4 +1,4 @@ -<sect1 id="gpsd_dbus.c"><title><filename>gpsd_dbus.c</filename></title> +<sect1 id="dbusexport.c"><title><filename>dbusexport.c</filename></title> <informaltable frame='all' pgwide='1'> <tgroup cols='2'> <colspec colname='c1'></colspec> diff --git a/doc/explanation.xml b/doc/explanation.xml index d1ba2db2..90f52d18 100644 --- a/doc/explanation.xml +++ b/doc/explanation.xml @@ -5,6 +5,7 @@ <!ENTITY homepage "http://gpsd.berlios.de"> <!ENTITY bits.h SYSTEM "explan_bits.h.xml"> +<!ENTITY dbusexport.c SYSTEM "explan_dbusexport.c.xml"> <!ENTITY driver_nmea.c SYSTEM "explan_driver_nmea.c.xml"> <!ENTITY driver_proto.c SYSTEM "explan_driver_proto.c.xml"> <!ENTITY driver_rtcm2.c SYSTEM "explan_driver_rtcm2.c.xml"> @@ -13,7 +14,6 @@ <!ENTITY gps.h SYSTEM "explan_gps.h.xml"> <!ENTITY gpsd.c SYSTEM "explan_gpsd.c.xml"> <!ENTITY gpsd.h SYSTEM "explan_gpsd.h.xml"> -<!ENTITY gpsd_dbus.c SYSTEM "explan_gpsd_dbus.c.xml"> <!ENTITY gpsd_report.c SYSTEM "explan_gpsd_report.c.xml"> <!ENTITY gpsdclient.c SYSTEM "explan_gpsdclient.c.xml"> <!ENTITY gpsutils.c SYSTEM "explan_gpsutils.c.xml"> @@ -86,6 +86,7 @@ is not yet documented here.</para> </articleinfo> &bits.h; +&dbusexport.c; &driver_nmea.c; &driver_proto.c; &driver_rtcm2.c; @@ -94,7 +95,6 @@ is not yet documented here.</para> &gps.h; &gpsd.c; &gpsd.h; -&gpsd_dbus.c; &gpsd_report.c; &gpsdclient.c; &gpsutils.c; @@ -43,7 +43,7 @@ #include "gpsd_config.h" #if defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S) -#include "gpsd_dbus.h" +#include "dbusexport.h" #endif /* defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S) */ #include "gpsd.h" |