Changeset f76f48f43622114cba817cfa78b9725e5cfd6beb

Show
Ignore:
Timestamp:
11/14/10 19:27:56 (3 years ago)
Author:
Nedko Arnaudov <nedko@…>
Children:
726f4cb642db41908eb070b351cba9ce5e2a88bb
Parents:
f9142569d92c4dad48da3405f731eab361904f96
git-author:
Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-14T19:25:34Z+0200
git-committer:
Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-14T19:27:56Z+0200
Message:

waf: fix the include path workaround

Files:
2 modified

Legend:

Unmodified
Added
Removed

  • assert.h

    rf914256 rf76f48f  
    3030#include "log.h" 
    3131 
    32 #include </usr/include/assert.h> 
     32#include <assert.h> 
    3333 
    3434#define ASSERT(expr)                                                  \ 

  • wscript

    rf914256 rf76f48f  
    301301    bld(rule=git_ver, target='version.h', update_outputs=True, always=True, ext_out=['.h']) 
    302302 
    303     daemon = bld.program(source = [], features = 'c cprogram', includes = ".") 
     303    daemon = bld.program(source = [], features = 'c cprogram', includes = [bld.path.get_bld()]) 
    304304    daemon.target = 'ladishd' 
    305305    daemon.uselib = 'DBUS-1 UUID EXPAT' 
    … …  
    387387    ##################################################### 
    388388    # jmcore 
    389     jmcore = bld.program(source = [], features = 'c cprogram', includes = ".") 
     389    jmcore = bld.program(source = [], features = 'c cprogram', includes = [bld.path.get_bld()]) 
    390390    jmcore.target = 'jmcore' 
    391391    jmcore.uselib = 'DBUS-1 JACK' 
    … …  
    407407    ##################################################### 
    408408    # conf 
    409     ladiconfd = bld.program(source = [], features = 'c cprogram', includes = ".") 
     409    ladiconfd = bld.program(source = [], features = 'c cprogram', includes = [bld.path.get_bld()]) 
    410410    ladiconfd.target = 'ladiconfd' 
    411411    ladiconfd.uselib = 'DBUS-1' 
    … …  
    438438    # liblash 
    439439    if bld.env['BUILD_LIBLASH']: 
    440         liblash = bld.shlib(source = [], features = 'c cshlib', includes = ".") 
     440        liblash = bld.shlib(source = [], features = 'c cshlib', includes = [bld.path.get_bld()]) 
    441441        liblash.uselib = 'DBUS-1' 
    442442        liblash.target = 'lash' 
    … …  
    478478    # gladish 
    479479    if bld.env['BUILD_GLADISH']: 
    480         gladish = bld.program(source = [], features = 'c cxx cxxprogram', includes = ".") 
     480        gladish = bld.program(source = [], features = 'c cxx cxxprogram', includes = [bld.path.get_bld()]) 
    481481        gladish.target = 'gladish' 
    482482        gladish.defines = ['LOG_OUTPUT_STDOUT']