diff options
| author | David Robillard <d@drobilla.net> | 2011-05-13 16:32:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-05-13 16:32:37 +0000 |
| commit | 45c5f6b3d6903f31eb2386c41f8a21d391404120 (patch) | |
| tree | ccb2f6c89418c53a8ca2ed9d77941d82d9e685dd /wscript | |
| parent | f75d7c69bfc0da5e588d0ef44bd103eae610c8ea (diff) | |
| download | serd-45c5f6b3d6903f31eb2386c41f8a21d391404120.tar.gz serd-45c5f6b3d6903f31eb2386c41f8a21d391404120.tar.bz2 serd-45c5f6b3d6903f31eb2386c41f8a21d391404120.zip | |
Use standard waf variable names for compiler flags so both independent and recursive builds work correctly.
git-svn-id: http://svn.drobilla.net/serd/trunk@178 490d8e77-9747-427b-9fa3-0b8f29cee8a0
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -53,10 +53,10 @@ def configure(conf): autowaf.define(conf, 'SERD_VERSION', SERD_VERSION) conf.write_config_header('serd-config.h', remove=False) - conf.env['SERD_CFLAGS'] = '-I%s/serd-%s' % ( - conf.env['INCLUDEDIR'], SERD_MAJOR_VERSION); - conf.env['SERD_LIBS'] = '-L%s -lserd-%s' % ( - conf.env['LIBDIR'], SERD_MAJOR_VERSION); + conf.env['INCLUDES_SERD'] = ['%s/serd-%s' % ( + conf.env['INCLUDEDIR'], SERD_MAJOR_VERSION)] + conf.env['LIBPATH_SERD'] = [conf.env['LIBDIR']] + conf.env['LIB_SERD'] = ['serd-%s' % SERD_MAJOR_VERSION]; autowaf.display_msg(conf, "Utilities", str(conf.env['BUILD_UTILS'])) autowaf.display_msg(conf, "Unit tests", str(conf.env['BUILD_TESTS'])) @@ -69,9 +69,7 @@ def build(bld): # Pkgconfig file autowaf.build_pc(bld, 'SERD', SERD_VERSION, SERD_MAJOR_VERSION, [], - {'SERD_CFLAGS' : bld.env['SERD_CFLAGS'], - 'SERD_LIBS' : bld.env['SERD_LIBS'], - 'SERD_MAJOR_VERSION' : SERD_MAJOR_VERSION}) + {'SERD_MAJOR_VERSION' : SERD_MAJOR_VERSION}) lib_source = ''' src/env.c |