[waf] Fix double linkage of *_lua.c in some commandline usage cases

personal/stbuehler/wip
Thomas Porzelt 13 years ago
parent 097d2000a6
commit 21cfd4ab71
  1. 26
      src/common/wscript
  2. 77
      src/main/wscript

@ -9,26 +9,26 @@ License and Copyright: see COPYING file
import Options, sys, Utils
source = '''
angel_connection.c
angel_data.c
encoding.c
idlist.c
ip_parsers.rl
module.c
radix.c
utils.c
waitqueue.c
'''
def configure(conf):
opts = Options.options
pass
def build(bld):
source = '''
angel_connection.c
angel_data.c
encoding.c
idlist.c
ip_parsers.rl
module.c
radix.c
utils.c
waitqueue.c
'''
libcommon = bld.new_task_gen(
features = 'cc cstaticlib',
features = 'cc cshlib',
source = source,
defines = ['HAVE_CONFIG_H=1'],
uselib = ['glib', 'gthread', 'gmodule', 'ev'],

@ -9,53 +9,52 @@ License and Copyright: see COPYING file
import Options, sys
source = '''
actions.c
angel.c
angel_fake.c
chunk.c
chunk_parser.c
collect.c
condition.c
config_parser.rl
connection.c
environment.c
etag.c
filter_chunked.c
http_headers.c
http_request_parser.rl
http_response_parser.rl
lighttpd-glue.c
lighttpd.c
log.c
network.c
network_sendfile.c
network_write.c
network_writev.c
options.c
plugin.c
plugin_core.c
profiler.c
request.c
response.c
server.c
stat_cache.c
throttle.c
url_parser.rl
value.c
virtualrequest.c
worker.c
'''
def configure(conf):
pass
def build(bld):
global source
libs = ['glib', 'gthread', 'gmodule', 'ev']
source = '''
actions.c
angel.c
angel_fake.c
chunk.c
chunk_parser.c
collect.c
condition.c
config_parser.rl
connection.c
environment.c
etag.c
filter_chunked.c
http_headers.c
http_request_parser.rl
http_response_parser.rl
lighttpd-glue.c
lighttpd.c
log.c
network.c
network_sendfile.c
network_write.c
network_writev.c
options.c
plugin.c
plugin_core.c
profiler.c
request.c
response.c
server.c
stat_cache.c
throttle.c
url_parser.rl
value.c
virtualrequest.c
worker.c
'''
if bld.env['USE_LUA'] == 1:
libs += ['lua']
source += '''

Loading…
Cancel
Save