diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-09-28 03:25:55 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-09-28 03:25:55 -0400 |
| commit | 702896ec598a531fa9263774912d7fe922037180 (patch) | |
| tree | dd90fa8f21b5f83fd279a5fb5c90db25a6fb1384 | |
| parent | c9236cfabe70ea6782c8d17333facfae8012aad1 (diff) | |
| download | gpsd-702896ec598a531fa9263774912d7fe922037180.tar.gz | |
Repair compilation of DBUS + Qt.
| -rw-r--r-- | SConstruct | 12 | ||||
| -rw-r--r-- | libgps_dbus.c | 1 |
2 files changed, 9 insertions, 4 deletions
@@ -717,13 +717,15 @@ libversion = "%d.%d.%d" % (libgps_major, libgps_minor, libgps_age) compiled_gpslib = Library(env=env, target="gps", sources=libgps_sources, - version=libversion, parse_flags= ["-lm"] + dbus_recv_libs) + version=libversion, + parse_flags= ["-lm"] + dbus_recv_libs) env.Clean(compiled_gpslib, "gps_maskdump.c") compiled_gpsdlib = Library(env=env, target="gpsd", sources=libgpsd_sources, - version=libversion, parse_flags=usblibs + rtlibs + bluezlibs) + version=libversion, + parse_flags=usblibs + rtlibs + bluezlibs) libraries = [compiled_gpslib, compiled_gpsdlib] @@ -745,7 +747,9 @@ if qt_env: compile_with = qt_env['CC'] compile_flags = qt_env['CFLAGS'] qtobjects.append(qt_env.SharedObject(src.split(".")[0] + '-qt', src, - CC=compile_with, CFLAGS=compile_flags)) + CC=compile_with, + CFLAGS=compile_flags, + parse_flags=dbus_recv_libs)) compiled_qgpsmmlib = Library(qt_env, "Qgpsmm", qtobjects, libversion) libraries.append(compiled_qgpsmmlib) @@ -820,7 +824,7 @@ binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gpxlogger, lcdgps] if ncurseslibs: binaries += [cgps, gpsmon] -clockwatcher = env.Program('clockwatcher', ['clockwatcher.c'], parse_flags=gpslibs+dbus_recv_libs) +clockwatcher = env.Program('clockwatcher', ['clockwatcher.c'], parse_flags=gpslibs) env.Depends(clockwatcher, compiled_gpslib) # Test programs diff --git a/libgps_dbus.c b/libgps_dbus.c index 56ded895..c948e931 100644 --- a/libgps_dbus.c +++ b/libgps_dbus.c @@ -13,6 +13,7 @@ #endif /* S_SPLINT_S */ #include "gps.h" +#include "libgps.h" #include "gpsd_config.h" #if defined(DBUS_EXPORT_ENABLE) && !defined(S_SPLINT_S) |