diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-03-24 19:47:17 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-03-24 19:47:17 -0400 |
| commit | 15cc034d819450d8da0fb54f28539595d1526d65 (patch) | |
| tree | 00f65a65af6681fbfe357f20d557fb62aff7903a /SConstruct | |
| parent | 368211d3fde217cc54b54333cf60dfdb18cf4c51 (diff) | |
| download | gpsd-15cc034d819450d8da0fb54f28539595d1526d65.tar.gz | |
Revert "Really force static linking of test programs."
A more subtle apprach is required
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -1011,8 +1011,6 @@ compiled_gpslib = Library(env=env, parse_flags=rtlibs) env.Clean(compiled_gpslib, "gps_maskdump.c") -static_gpslib = env.StaticLibrary("gps_static", libgps_sources, rtlibs) - compiled_gpsdlib = env.StaticLibrary(target="gpsd", source=libgpsd_sources, parse_flags=usbflags + bluezflags) @@ -1119,22 +1117,22 @@ test_trig = env.Program('test_trig', ['test_trig.c'], parse_flags=["-lm"]) test_bits = env.Program('test_bits', ['test_bits.c'], LIBS=['gps'], LIBPATH='.') test_matrix = env.Program('test_matrix', ['test_matrix.c'], - LIBS=['gpsd', 'gps_static'], + LIBS=['gpsd', 'gps'], LIBPATH='.', parse_flags=gpsdflags) test_packet = env.Program('test_packet', ['test_packet.c'], - LIBS=['gpsd', 'gps_static'], + LIBS=['gpsd', 'gps'], LIBPATH='.', parse_flags=gpsdflags) test_geoid = env.Program('test_geoid', ['test_geoid.c'], - LIBS=['gpsd', 'gps_static'], + LIBS=['gpsd', 'gps'], LIBPATH='.', parse_flags=gpsdflags) test_mktime = env.Program('test_mktime', ['test_mktime.c'], - LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"]) + LIBS=['gps'], LIBPATH='.', parse_flags=["-lm"]) test_libgps = env.Program('test_libgps', ['test_libgps.c'], - LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"] + rtlibs) + LIBS=['gps'], LIBPATH='.', parse_flags=["-lm"]) test_json = env.Program('test_json', ['test_json.c'], - LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"] + rtlibs) + LIBS=['gps'], LIBPATH='.', parse_flags=["-lm"]) test_gpsmm = env.Program('test_gpsmm', ['test_gpsmm.cpp'], - LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"]) + LIBS=['gps'], LIBPATH='.', parse_flags=["-lm"]) testprogs = [test_float, test_trig, test_bits, test_matrix, test_packet, test_mktime, test_geoid, test_libgps] if env['socket_export']: |