ovn: Move all library files into ovn/lib, and merge libraries.

There is no value in having two separate libraries for OVN.

Reported-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>

diff --git a/ovn/.gitignore b/ovn/.gitignore
index 8f6a631455891865f9a6dabc29cbd8570efcd82f..4c13616b14f4164fef7a8538a4dd881ef2dd100a 100644 (file)
--- a/ovn/.gitignore
+++ b/ovn/.gitignore
@@ -2,14 +2,8 @@
 /ovn-nb.5
 /ovn-nb.gv
 /ovn-nb.pic
-/ovn-nb-idl.c
-/ovn-nb-idl.h
-/ovn-nb-idl.ovsidl
 /ovn-sb.5
 /ovn-sb.gv
 /ovn-sb.pic
-/ovn-sb-idl.c
-/ovn-sb-idl.h
-/ovn-sb-idl.ovsidl
 /ovn-nbctl
 /ovn-nbctl.8

diff --git a/ovn/automake.mk b/ovn/automake.mk
index 672ef3fc47ad6fd485d42ffde91fe1991011cf68..4be5381359e8c51fbb3095712b9addcb0c9448d1 100644 (file)
--- a/ovn/automake.mk
+++ b/ovn/automake.mk
@@ -78,50 +78,10 @@ EXTRA_DIST += \
        ovn/TODO \
        ovn/CONTAINERS.OpenStack.md
 
-# ovn-sb IDL
-OVSIDL_BUILT += \
-       $(srcdir)/ovn/ovn-sb-idl.c \
-       $(srcdir)/ovn/ovn-sb-idl.h \
-       $(srcdir)/ovn/ovn-sb.ovsidl
-EXTRA_DIST += $(srcdir)/ovn/ovn-sb-idl.ann
-OVN_SB_IDL_FILES = \
-       $(srcdir)/ovn/ovn-sb.ovsschema \
-       $(srcdir)/ovn/ovn-sb-idl.ann
-$(srcdir)/ovn/ovn-sb-idl.ovsidl: $(OVN_SB_IDL_FILES)
-       $(AM_V_GEN)$(OVSDB_IDLC) annotate $(OVN_SB_IDL_FILES) > $@.tmp && \
-       mv $@.tmp $@
-CLEANFILES += ovn/ovn-sb-idl.c ovn/ovn-sb-idl.h
-
-# ovn-nb IDL
-OVSIDL_BUILT += \
-       $(srcdir)/ovn/ovn-nb-idl.c \
-       $(srcdir)/ovn/ovn-nb-idl.h \
-       $(srcdir)/ovn/ovn-nb.ovsidl
-EXTRA_DIST += $(srcdir)/ovn/ovn-nb-idl.ann
-OVN_NB_IDL_FILES = \
-       $(srcdir)/ovn/ovn-nb.ovsschema \
-       $(srcdir)/ovn/ovn-nb-idl.ann
-$(srcdir)/ovn/ovn-nb-idl.ovsidl: $(OVN_NB_IDL_FILES)
-       $(AM_V_GEN)$(OVSDB_IDLC) annotate $(OVN_NB_IDL_FILES) > $@.tmp && \
-       mv $@.tmp $@
-CLEANFILES += ovn/ovn-nb-idl.c ovn/ovn-nb-idl.h
-
-# libovn
-lib_LTLIBRARIES += ovn/libovn.la
-ovn_libovn_la_LDFLAGS = \
-        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-        -Wl,--version-script=$(top_builddir)/ovn/libovn.sym \
-        $(AM_LDFLAGS)
-ovn_libovn_la_SOURCES = \
-       ovn/ovn-sb-idl.c \
-       ovn/ovn-sb-idl.h \
-       ovn/ovn-nb-idl.c \
-       ovn/ovn-nb-idl.h
-
 # ovn-nbctl
 bin_PROGRAMS += ovn/ovn-nbctl
 ovn_ovn_nbctl_SOURCES = ovn/ovn-nbctl.c
-ovn_ovn_nbctl_LDADD = ovn/libovn.la ovsdb/libovsdb.la lib/libopenvswitch.la
+ovn_ovn_nbctl_LDADD = ovn/lib/libovn.la ovsdb/libovsdb.la lib/libopenvswitch.la
 
 include ovn/controller/automake.mk
 include ovn/lib/automake.mk

diff --git a/ovn/controller/automake.mk b/ovn/controller/automake.mk
index 7274cbdb5116ff95664b34f193ba36681f90993f..4a266daa39a7c546e6c1ba54f9ad51d2a3491c68 100644 (file)
--- a/ovn/controller/automake.mk
+++ b/ovn/controller/automake.mk
@@ -6,6 +6,6 @@ ovn_controller_ovn_controller_SOURCES = \
        ovn/controller/chassis.h \
        ovn/controller/ovn-controller.c \
        ovn/controller/ovn-controller.h
-ovn_controller_ovn_controller_LDADD = ovn/libovn.la lib/libopenvswitch.la
+ovn_controller_ovn_controller_LDADD = ovn/lib/libovn.la lib/libopenvswitch.la
 man_MANS += ovn/controller/ovn-controller.8
 EXTRA_DIST += ovn/controller/ovn-controller.8.xml

diff --git a/ovn/controller/bindings.c b/ovn/controller/bindings.c
index bea4c38a4d85ee28de57fe3f6772440e9f10f58e..746110e508df811bcc70b259e1668a803f015b46 100644 (file)
--- a/ovn/controller/bindings.c
+++ b/ovn/controller/bindings.c
@@ -20,7 +20,7 @@
 #include "lib/util.h"
 #include "lib/vswitch-idl.h"
 #include "openvswitch/vlog.h"
-#include "ovn/ovn-sb-idl.h"
+#include "ovn/lib/ovn-sb-idl.h"
 #include "ovn-controller.h"
 
 VLOG_DEFINE_THIS_MODULE(bindings);

diff --git a/ovn/controller/chassis.c b/ovn/controller/chassis.c
index 2d6e5e60cfac1a4e62265bd97474323ebe7be7b2..768b8121f563cf14f80e5ec07c99d775ea424fdd 100644 (file)
--- a/ovn/controller/chassis.c
+++ b/ovn/controller/chassis.c
@@ -20,7 +20,7 @@
 #include "lib/util.h"
 #include "lib/vswitch-idl.h"
 #include "openvswitch/vlog.h"
-#include "ovn/ovn-sb-idl.h"
+#include "ovn/lib/ovn-sb-idl.h"
 #include "ovn-controller.h"
 
 VLOG_DEFINE_THIS_MODULE(chassis);

diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index 35ab6ed81291d7c2162af4a32dfcdb3baad5a072..44a4d5e3ca17fe1dcc6794d163f2507e13749e0c 100644 (file)
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -27,7 +27,7 @@
 #include "dirs.h"
 #include "openvswitch/vconn.h"
 #include "openvswitch/vlog.h"
-#include "ovn/ovn-sb-idl.h"
+#include "ovn/lib/ovn-sb-idl.h"
 #include "poll-loop.h"
 #include "fatal-signal.h"
 #include "lib/vswitch-idl.h"

diff --git a/ovn/lib/.gitignore b/ovn/lib/.gitignore
new file mode 100644 (file)
index 0000000..846df01
--- /dev/null
+++ b/ovn/lib/.gitignore
@@ -0,0 +1,6 @@
+/ovn-nb-idl.c
+/ovn-nb-idl.h
+/ovn-nb-idl.ovsidl
+/ovn-sb-idl.c
+/ovn-sb-idl.h
+/ovn-sb-idl.ovsidl

diff --git a/ovn/lib/automake.mk b/ovn/lib/automake.mk
index 91a4fe87180e89470f4e613711cceaf5631a5b9a..454f2efe41de6ffce32295171bb5506175178fae 100644 (file)
--- a/ovn/lib/automake.mk
+++ b/ovn/lib/automake.mk
@@ -1,6 +1,43 @@
 lib_LTLIBRARIES += ovn/lib/libovn.la
+ovn_lib_libovn_la_LDFLAGS = \
+        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+        -Wl,--version-script=$(top_builddir)/ovn/lib/libovn.sym \
+        $(AM_LDFLAGS)
 ovn_lib_libovn_la_SOURCES = \
        ovn/lib/expr.c \
        ovn/lib/expr.h \
        ovn/lib/lex.c \
-       ovn/lib/lex.h
+       ovn/lib/lex.h \
+       ovn/lib/ovn-nb-idl.c \
+       ovn/lib/ovn-nb-idl.h \
+       ovn/lib/ovn-sb-idl.c \
+       ovn/lib/ovn-sb-idl.h
+
+# ovn-sb IDL
+OVSIDL_BUILT += \
+       $(srcdir)/ovn/lib/ovn-sb-idl.c \
+       $(srcdir)/ovn/lib/ovn-sb-idl.h \
+       $(srcdir)/ovn/lib/ovn-sb-idl.ovsidl
+EXTRA_DIST += $(srcdir)/ovn/lib/ovn-sb-idl.ann
+OVN_SB_IDL_FILES = \
+       $(srcdir)/ovn/ovn-sb.ovsschema \
+       $(srcdir)/ovn/lib/ovn-sb-idl.ann
+$(srcdir)/ovn/lib/ovn-sb-idl.ovsidl: $(OVN_SB_IDL_FILES)
+       $(AM_V_GEN)$(OVSDB_IDLC) annotate $(OVN_SB_IDL_FILES) > $@.tmp && \
+       mv $@.tmp $@
+CLEANFILES += ovn/lib/ovn-sb-idl.c ovn/lib/ovn-sb-idl.h
+
+# ovn-nb IDL
+OVSIDL_BUILT += \
+       $(srcdir)/ovn/lib/ovn-nb-idl.c \
+       $(srcdir)/ovn/lib/ovn-nb-idl.h \
+       $(srcdir)/ovn/lib/ovn-nb-idl.ovsidl
+EXTRA_DIST += $(srcdir)/ovn/lib/ovn-nb-idl.ann
+OVN_NB_IDL_FILES = \
+       $(srcdir)/ovn/ovn-nb.ovsschema \
+       $(srcdir)/ovn/lib/ovn-nb-idl.ann
+$(srcdir)/ovn/lib/ovn-nb-idl.ovsidl: $(OVN_NB_IDL_FILES)
+       $(AM_V_GEN)$(OVSDB_IDLC) annotate $(OVN_NB_IDL_FILES) > $@.tmp && \
+       mv $@.tmp $@
+CLEANFILES += ovn/lib/ovn-nb-idl.c ovn/lib/ovn-nb-idl.h
+

diff --git a/ovn/lib/ovn-nb-idl.ann b/ovn/lib/ovn-nb-idl.ann
new file mode 100644 (file)
index 0000000..76d7384
--- /dev/null
+++ b/ovn/lib/ovn-nb-idl.ann
@@ -0,0 +1,9 @@
+# -*- python -*-
+
+# This code, when invoked by "ovsdb-idlc annotate" (by the build
+# process), annotates vswitch.ovsschema with additional data that give
+# the ovsdb-idl engine information about the types involved, so that
+# it can generate more programmer-friendly data structures.
+
+s["idlPrefix"] = "nbrec_"
+s["idlHeader"] = "\"ovn/lib/ovn-nb-idl.h\""

diff --git a/ovn/lib/ovn-sb-idl.ann b/ovn/lib/ovn-sb-idl.ann
new file mode 100644 (file)
index 0000000..2dfc64e
--- /dev/null
+++ b/ovn/lib/ovn-sb-idl.ann
@@ -0,0 +1,9 @@
+# -*- python -*-
+
+# This code, when invoked by "ovsdb-idlc annotate" (by the build
+# process), annotates vswitch.ovsschema with additional data that give
+# the ovsdb-idl engine information about the types involved, so that
+# it can generate more programmer-friendly data structures.
+
+s["idlPrefix"] = "sbrec_"
+s["idlHeader"] = "\"ovn/lib/ovn-sb-idl.h\""

diff --git a/ovn/northd/automake.mk b/ovn/northd/automake.mk
index 6f6c1f57ea530f49d2215b15d25c0368b06e8452..f83295b1380ec2741c35f842e1d23e657ac6e286 100644 (file)
--- a/ovn/northd/automake.mk
+++ b/ovn/northd/automake.mk
@@ -2,7 +2,6 @@
 bin_PROGRAMS += ovn/northd/ovn-northd
 ovn_northd_ovn_northd_SOURCES = ovn/northd/ovn-northd.c
 ovn_northd_ovn_northd_LDADD = \
-       ovn/libovn.la \
        ovn/lib/libovn.la \
        ovsdb/libovsdb.la \
        lib/libopenvswitch.la

diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
index 4868cffbacb4d325fadfd8922ccd2f257af6c03f..8a09ce16aec94cba69c2737a7f096ab2b885a58f 100644 (file)
--- a/ovn/northd/ovn-northd.c
+++ b/ovn/northd/ovn-northd.c
@@ -27,8 +27,8 @@
 #include "hmap.h"
 #include "json.h"
 #include "ovn/lib/lex.h"
-#include "ovn/ovn-nb-idl.h"
-#include "ovn/ovn-sb-idl.h"
+#include "ovn/lib/ovn-nb-idl.h"
+#include "ovn/lib/ovn-sb-idl.h"
 #include "poll-loop.h"
 #include "stream.h"
 #include "stream-ssl.h"

diff --git a/ovn/ovn-nb-idl.ann b/ovn/ovn-nb-idl.ann
deleted file mode 100644 (file)
index 4c38e45..0000000
--- a/ovn/ovn-nb-idl.ann
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- python -*-
-
-# This code, when invoked by "ovsdb-idlc annotate" (by the build
-# process), annotates vswitch.ovsschema with additional data that give
-# the ovsdb-idl engine information about the types involved, so that
-# it can generate more programmer-friendly data structures.
-
-s["idlPrefix"] = "nbrec_"
-s["idlHeader"] = "\"ovn/ovn-nb-idl.h\""

diff --git a/ovn/ovn-nbctl.c b/ovn/ovn-nbctl.c
index 38cdd3acbb14a9687d993cc78ef3b95405f421b4..2eb6e15776337c372e9e2ee5d8e91b73b38fa236 100644 (file)
--- a/ovn/ovn-nbctl.c
+++ b/ovn/ovn-nbctl.c
@@ -22,7 +22,7 @@
 #include "command-line.h"
 #include "dirs.h"
 #include "fatal-signal.h"
-#include "ovn/ovn-nb-idl.h"
+#include "ovn/lib/ovn-nb-idl.h"
 #include "poll-loop.h"
 #include "process.h"
 #include "stream.h"

diff --git a/ovn/ovn-sb-idl.ann b/ovn/ovn-sb-idl.ann
deleted file mode 100644 (file)
index 1efef5c..0000000
--- a/ovn/ovn-sb-idl.ann
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- python -*-
-
-# This code, when invoked by "ovsdb-idlc annotate" (by the build
-# process), annotates vswitch.ovsschema with additional data that give
-# the ovsdb-idl engine information about the types involved, so that
-# it can generate more programmer-friendly data structures.
-
-s["idlPrefix"] = "sbrec_"
-s["idlHeader"] = "\"ovn/ovn-sb-idl.h\""