Small source movements (ccn_* to ccn/). Small change of NameBuilder implementation
diff --git a/wscript b/wscript
index 1747f46..f7be7cb 100644
--- a/wscript
+++ b/wscript
@@ -1,17 +1,19 @@
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
def build(bld):
- module = bld.create_ns3_module('NDNabstraction', ['core', 'network'])
+ module = bld.create_ns3_module('NDNabstraction', ['applications', 'core', 'network', 'internet', 'point-to-point'])
module.includes = '.'
module.source = [
+ 'model/ccn/ccn_charbuf.c',
+ 'model/ccn/ccn_name_util.c',
+ 'model/ccn/ccn_coding.c',
+ 'model/ccn/ccn_indexbuf.c',
+ 'model/ccn/ccn_random.c',
+ 'model/ccn/ccn_buf_decoder.c',
+ 'model/ccn/ccn_buf_encoder.c',
+
'model/ndnabstraction-header.cc',
- 'model/ccn_charbuf.cc',
- 'model/ccn_name_util.cc',
- 'model/ccn_coding.cc',
- 'model/ccn_indexbuf.cc',
- 'model/ccn_random.cc',
- 'model/ccn_buf_decoder.cc',
- 'model/ccn_buf_encoder.cc',
+
'model/ndn_face.cc',
'model/ndn_interestpacket.cc',
'model/ndn_contentpacket.cc',
@@ -31,13 +33,15 @@
headers = bld.new_task_gen('ns3header')
headers.module = 'NDNabstraction'
headers.source = [
+ 'model/ccn/ccn.h',
+ 'model/ccn/ccn_charbuf.h',
+ 'model/ccn/ccn_coding.h',
+ 'model/ccn/ccn_name_util.h',
+ 'model/ccn/ccn_indexbuf.h',
+ 'model/ccn/ccn_random.h',
+
'model/ndnabstraction-header.h',
- 'model/ccn_charbuf.h',
- 'model/ccn_name_util.h',
- 'model/ccn_coding.h',
- 'model/ccn_indexbuf.h',
- 'model/ccn_random.h',
- 'model/ccn_ccn.h',
+
'model/ndn_face.h',
'model/ndn_interestpacket.h',
'model/ndn_contentpacket.h',
@@ -57,3 +61,8 @@
bld.add_subdirs('examples')
#bld.ns3_python_bindings()
+ #bld.env['CXXFLAGS']=[filter(lambda x: x not in bld.env, sublist) for sublist in [['-Wall'], ['-Werror'], ['-Wextra']]]
+ # bld.env['CXXFLAGS']=[]
+ # bld.env['CFLAGS']=[]
+
+