From: Numan Siddique <[email protected]>
Acked-by: Mark Michelson <[email protected]>
Signed-off-by: Numan Siddique <[email protected]>
---
controller/automake.mk | 2 --
controller/if-status.c | 2 +-
controller/ovn-controller.c | 2 +-
lib/automake.mk | 2 ++
{controller => lib}/ofctrl-seqno.c | 0
{controller => lib}/ofctrl-seqno.h | 0
{controller => lib}/test-ofctrl-seqno.c | 0
tests/automake.mk | 3 +--
8 files changed, 5 insertions(+), 6 deletions(-)
rename {controller => lib}/ofctrl-seqno.c (100%)
rename {controller => lib}/ofctrl-seqno.h (100%)
rename {controller => lib}/test-ofctrl-seqno.c (100%)
diff --git a/controller/automake.mk b/controller/automake.mk
index 4894461142..d6809df106 100644
--- a/controller/automake.mk
+++ b/controller/automake.mk
@@ -32,8 +32,6 @@ controller_ovn_controller_SOURCES = \
controller/lport.h \
controller/ofctrl.c \
controller/ofctrl.h \
- controller/ofctrl-seqno.c \
- controller/ofctrl-seqno.h \
controller/neighbor.c \
controller/neighbor.h \
controller/neighbor-of.c \
diff --git a/controller/if-status.c b/controller/if-status.c
index 5b176b86da..ee9337e636 100644
--- a/controller/if-status.c
+++ b/controller/if-status.c
@@ -17,7 +17,7 @@
#include "binding.h"
#include "if-status.h"
-#include "ofctrl-seqno.h"
+#include "lib/ofctrl-seqno.h"
#include "ovsport.h"
#include "simap.h"
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
index 2375dbbb27..c4c568e7b4 100644
--- a/controller/ovn-controller.c
+++ b/controller/ovn-controller.c
@@ -48,7 +48,7 @@
#include "lport.h"
#include "memory.h"
#include "ofctrl.h"
-#include "ofctrl-seqno.h"
+#include "lib/ofctrl-seqno.h"
#include "openvswitch/vconn.h"
#include "openvswitch/vlog.h"
#include "ovn/actions.h"
diff --git a/lib/automake.mk b/lib/automake.mk
index 5e7720051c..3924c631cb 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -37,6 +37,8 @@ lib_libovn_la_SOURCES = \
lib/lex.c \
lib/objdep.c \
lib/objdep.h \
+ lib/ofctrl-seqno.c \
+ lib/ofctrl-seqno.h \
lib/ovn-l7.h \
lib/ovn-l7.c \
lib/ovn-util.c \
diff --git a/controller/ofctrl-seqno.c b/lib/ofctrl-seqno.c
similarity index 100%
rename from controller/ofctrl-seqno.c
rename to lib/ofctrl-seqno.c
diff --git a/controller/ofctrl-seqno.h b/lib/ofctrl-seqno.h
similarity index 100%
rename from controller/ofctrl-seqno.h
rename to lib/ofctrl-seqno.h
diff --git a/controller/test-ofctrl-seqno.c b/lib/test-ofctrl-seqno.c
similarity index 100%
rename from controller/test-ofctrl-seqno.c
rename to lib/test-ofctrl-seqno.c
diff --git a/tests/automake.mk b/tests/automake.mk
index a555e0cd42..5d55042e61 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -288,10 +288,10 @@ tests_ovstest_SOURCES = \
tests/test-ovn.c \
tests/test-vector.c \
controller/test-lflow-cache.c \
- controller/test-ofctrl-seqno.c \
controller/test-vif-plug.c \
lib/test-lflow-conj-ids.c \
lib/test-ovn-features.c \
+ lib/test-ofctrl-seqno.c \
northd/test-ipam.c
if HAVE_NETLINK
@@ -317,7 +317,6 @@ tests_ovstest_LDADD = $(OVS_LIBDIR)/daemon.lo \
controller/lflow-cache.$(OBJEXT) \
controller/local_data.$(OBJEXT) \
controller/lport.$(OBJEXT) \
- controller/ofctrl-seqno.$(OBJEXT) \
controller/ovsport.$(OBJEXT) \
controller/patch.$(OBJEXT) \
controller/route.$(OBJEXT) \
--
2.51.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
