From 55239207f4039d1168d627e53843abc53170ccdb Mon Sep 17 00:00:00 2001 From: "roberto@quantal64" Date: Mon, 9 Jul 2012 19:00:08 +0200 Subject: [PATCH] started moving sources to core directory --HG-- rename : emperor.c => core/emperor.c rename : master.c => core/master.c rename : master_utils.c => core/master_utils.c --- emperor.c => core/emperor.c | 0 master.c => core/master.c | 0 master_utils.c => core/master_utils.c | 0 uwsgiconfig.py | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename emperor.c => core/emperor.c (100%) rename master.c => core/master.c (100%) rename master_utils.c => core/master_utils.c (100%) diff --git a/emperor.c b/core/emperor.c similarity index 100% rename from emperor.c rename to core/emperor.c diff --git a/master.c b/core/master.c similarity index 100% rename from master.c rename to core/master.c diff --git a/master_utils.c b/core/master_utils.c similarity index 100% rename from master_utils.c rename to core/master_utils.c diff --git a/uwsgiconfig.py b/uwsgiconfig.py index d371ee5c..5e566103 100644 --- a/uwsgiconfig.py +++ b/uwsgiconfig.py @@ -342,7 +342,7 @@ class uConf(object): ulp.close() self.config.read(filename) - self.gcc_list = ['utils', 'protocol', 'socket', 'logging', 'master', 'master_utils', 'emperor', 'notify', 'mule', 'subscription', 'stats', + self.gcc_list = ['utils', 'protocol', 'socket', 'logging', 'src/master', 'src/master_utils', 'emperor', 'notify', 'mule', 'subscription', 'stats', 'setup_utils', 'plugins', 'lock', 'cache', 'queue', 'event', 'signal', 'cluster', 'rpc', 'gateway', 'loop', 'lib/rbtree', 'lib/amqp', 'rb_timers', 'uwsgi'] # add protocols @@ -352,7 +352,7 @@ class uConf(object): self.gcc_list.append('proto/fastcgi') self.include_path = [] - self.cflags = ['-O2', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() + self.cflags = ['-O2', '-I.', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() report['kernel'] = uwsgi_os