diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2005-05-20 19:07:37 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2005-05-20 19:07:37 +0000 |
| commit | a1a63fb9ffb0911822ba09224f9e0703c5dc820b (patch) | |
| tree | 31799a8c6826926b71a0e886ffc7b666b52bb89d | |
| parent | 5f1bb5f08d90de58508aa94dcc8f6e8a6a4db548 (diff) | |
| download | gpsd-a1a63fb9ffb0911822ba09224f9e0703c5dc820b.tar.gz | |
C++ class wrapper is now part of libgps.a.
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | gpsd.spec.in | 5 | ||||
| -rw-r--r-- | libgps.xml | 2 | ||||
| -rw-r--r-- | libgpsmm.xml | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 232f71db..6e96b736 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ xgpsspeed_LDADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(XAW_LIBS) $(XM_LIBS) # gpsmm_test_SOURCES = \ gpsmm_test.cpp -gpsmm_test_LDADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(XAW_LIBS) $(XM_LIBS) $(X_LIBS) $(X_PRE_LIBS) libgpsmm.la -lm +gpsmm_test_LDADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(XAW_LIBS) $(XM_LIBS) $(X_LIBS) $(X_PRE_LIBS) libgps.la -lm # # Build gpsd @@ -61,7 +61,7 @@ sirfmon_LDADD = $(LIBM) -lncurses libgps.la -lm $(LIBPTHREAD) # Build shared libraries # libgps_la_LDFLAGS = -version-number 12:0:0 -lib_LTLIBRARIES = libgps.la libgpsmm.la +lib_LTLIBRARIES = libgps.la libgps_la_SOURCES = \ netlib.c \ @@ -77,14 +77,11 @@ libgps_la_SOURCES = \ gpsutils.c \ geoid.c \ sirf.c \ - report.c + report.c \ + libgpsmm.cpp libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) -libgpsmm_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) libgps.la -libgpsmm_la_SOURCES = \ - libgpsmm.cpp - # # Create Manpages # @@ -149,6 +146,7 @@ EXTRA_DIST = \ xgps.xml \ libgpsd.xml \ libgps.xml \ + libgpsmm.xml \ gpsprof.xml \ gpsfake.xml \ sirfmon.xml \ diff --git a/gpsd.spec.in b/gpsd.spec.in index f2190d50..8a20beb3 100644 --- a/gpsd.spec.in +++ b/gpsd.spec.in @@ -87,7 +87,7 @@ cp gps.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages %files %defattr(-,root,root,-) -%doc README INSTALL COPYING TODO +%doc README INSTALL COPYING %attr(755, root, root) %{_sbindir}/gpsd %attr(755, root, root) %{_bindir}/gpsprof %attr(755, root, root) %{_bindir}/sirfmon @@ -101,13 +101,14 @@ cp gps.py "$RPM_BUILD_ROOT"%{_libdir}/python${PYVERSION}/site-packages %files -n gpsd-devel %defattr(-,root,root,-) -%doc README INSTALL COPYING libgps.xml libgpsd.xml HACKING +%doc README INSTALL COPYING HACKING TODO %{_includedir}/gps.h %{_includedir}/gpsd.h %{_includedir}/gpsutils.h %{_libdir}/libgps.a %{_mandir}/man1/gpsfake.1* %{_mandir}/man3/libgps.3* +%{_mandir}/man3/libgpsmm.3* %{_mandir}/man3/libgpsd.3* %attr(755, root, root) %{_bindir}/gpsfake %{_libdir}/python*/site-packages/gps.py* @@ -11,7 +11,7 @@ </refmeta> <refnamediv id='name'> <refname>libgps</refname> -<refpurpose>service library for communicationg with the GPS daemon</refpurpose> +<refpurpose>C service library for communicating with the GPS daemon</refpurpose> </refnamediv> <refsynopsisdiv id='synopsis'> <funcsynopsis> diff --git a/libgpsmm.xml b/libgpsmm.xml index 66463ada..a3764fe5 100644 --- a/libgpsmm.xml +++ b/libgpsmm.xml @@ -11,7 +11,7 @@ </refmeta> <refnamediv id='name'> <refname>libgpsmm</refname> -<refpurpose>service library for communicationg with the GPS daemon</refpurpose> +<refpurpose>C++ class wrapper for the GPS daemon</refpurpose> </refnamediv> <refsynopsisdiv id='synopsis'> <funcsynopsis> |