From 2c6639c695aebf0cd5ac74ad31fd331547fa0126 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Thu, 19 Dec 2019 11:55:54 +0100 Subject: nat: move dslite to separate sub-plugin Type: refactor Change-Id: If3d9f16f3a06c10b354f1eef674e8db5f3c44de7 Signed-off-by: Ole Troan --- src/plugins/nat/CMakeLists.txt | 51 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 21 deletions(-) (limited to 'src/plugins/nat/CMakeLists.txt') diff --git a/src/plugins/nat/CMakeLists.txt b/src/plugins/nat/CMakeLists.txt index edba893cafe..a1a01789240 100644 --- a/src/plugins/nat/CMakeLists.txt +++ b/src/plugins/nat/CMakeLists.txt @@ -11,21 +11,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -set(NAT_SRCS +set(CMAKE_VERBOSE_MAKEFILE ON) + +add_vpp_library(nat + SOURCES lib/alloc.c -) -set(NAT_HEADERS + INSTALL_HEADERS lib/alloc.h ) -add_vpp_library(nat - SOURCES ${NAT_SRCS} - LINK_LIBRARIES m - INSTALL_HEADERS ${NAT_HEADERS} - COMPONENT libnat -) - add_vpp_plugin(nat SOURCES nat.c @@ -48,13 +43,6 @@ add_vpp_plugin(nat nat64_in2out.c nat64_out2in.c nat64_db.c - dslite_dpo.c - dslite.c - dslite_in2out.c - dslite_out2in.c - dslite_cli.c - dslite_ce_encap.c - dslite_ce_decap.c nat66.c nat66_cli.c nat66_in2out.c @@ -65,10 +53,6 @@ add_vpp_plugin(nat nat_ha.c MULTIARCH_SOURCES - dslite_ce_decap.c - dslite_ce_encap.c - dslite_in2out.c - dslite_out2in.c in2out.c in2out_ed.c nat44_classify.c @@ -93,3 +77,28 @@ add_vpp_plugin(nat nat_all_api_h.h nat_msg_enum.h ) + +add_vpp_plugin(dslite + SOURCES + nat_format.c + nat_syslog.c + dslite/dslite_api.c + dslite/dslite_dpo.c + dslite/dslite.c + dslite/dslite_in2out.c + dslite/dslite_out2in.c + dslite/dslite_cli.c + dslite/dslite_ce_encap.c + dslite/dslite_ce_decap.c + + MULTIARCH_SOURCES + dslite/dslite_ce_decap.c + dslite/dslite_ce_encap.c + dslite/dslite_in2out.c + dslite/dslite_out2in.c + + API_FILES + dslite/dslite.api + + LINK_LIBRARIES nat +) -- cgit 1.2.3-korg