Browse Source

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
zrythm_meson
David Robillard 12 years ago
parent
commit
45c5f6b3d6
  1. 4
      serd.pc.in
  2. 12
      wscript

4
serd.pc.in

@ -6,5 +6,5 @@ includedir=@includedir@ @@ -6,5 +6,5 @@ includedir=@includedir@
Name: Serd
Version: @SERD_VERSION@
Description: Lightweight RDF syntax library
Libs: @SERD_LIBS@
Cflags: @SERD_CFLAGS@
Libs: -L@LIBPATH_SERD@ -l@LIB_SERD@
Cflags: -I@INCLUDES_SERD@

12
wscript

@ -53,10 +53,10 @@ def configure(conf): @@ -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): @@ -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

Loading…
Cancel
Save