diff options
| author |   imarom <imarom@cisco.com> | 2015-08-30 11:41:42 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-08-30 11:41:42 +0300 |
| commit | c9381643e7bf9b3dc690bf3e012ad6176ee32b8c (patch) | |
| tree | ff0e91ee5c38f2caaeaa53340ecf2db2a326455a /linux_dpdk | |
| parent | 05a529031e962d61ab977393fb3d153931feff34 (diff) | |
| parent | 53f0e28d7f30c7175cbb15884c309613593859d8 (diff) | |
Merge branch 'master' into rpc
Conflicts:
linux/ws_main.py
linux_dpdk/ws_main.py
Diffstat (limited to 'linux_dpdk')
| -rwxr-xr-x | linux_dpdk/ws_main.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index aa270e69..24ffe18e 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -156,7 +156,7 @@ json_src = SrcGroup(dir='external_libs/json', 'jsoncpp.cpp' ]) -yaml_src = SrcGroup(dir='yaml-cpp/src/', +yaml_src = SrcGroup(dir='external_libs/yaml-cpp/src/', src_list=[ 'aliasmanager.cpp', 'binary.cpp', @@ -400,10 +400,13 @@ common_flags_old = common_flags + [ includes_path =''' ../src/pal/linux_dpdk/ ../src/ - ../external_libs/json/ + ../src/rpc-server/ - ../yaml-cpp/include/ - ../src/zmq/include/ + + ../external_libs/yaml-cpp/include/ + ../external_libs/zmq/include/ + ../external_libs/json/ + ../src/dpdk_lib18/librte_eal/linuxapp/eal/include/ ../src/dpdk_lib18/librte_eal/common/include/ ../src/dpdk_lib18/librte_eal/common/ @@ -592,7 +595,7 @@ build_types = [ def build_prog (bld, build_obj): - zmq_lib_path='src/zmq/' + zmq_lib_path='external_libs/zmq/' bld.read_shlib( name='zmq' , paths=[top+zmq_lib_path] ) #rte_libs =[ @@ -749,7 +752,7 @@ files_list=[ 'trex_daemon_server' ]; -files_dir=['cap2','avl','cfg','ko','automation','python-lib'] +files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib'] class Env(object): |