From: Ben Pfaff Date: Wed, 22 Apr 2015 00:36:52 +0000 (-0700) Subject: ovn: Move all library files into ovn/lib, and merge libraries. X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e3df8838451bdc3b025d3049009c37f8addc7d41;p=ovs.git 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 Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- diff --git a/ovn/.gitignore b/ovn/.gitignore index 8f6a63145..4c13616b1 100644 --- 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 672ef3fc4..4be538135 100644 --- 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 7274cbdb5..4a266daa3 100644 --- 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 bea4c38a4..746110e50 100644 --- 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 2d6e5e60c..768b8121f 100644 --- 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 35ab6ed81..44a4d5e3c 100644 --- 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 index 000000000..846df0105 --- /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 91a4fe871..454f2efe4 100644 --- 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 index 000000000..76d7384fc --- /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 index 000000000..2dfc64e3c --- /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 6f6c1f57e..f83295b13 100644 --- 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 4868cffba..8a09ce16a 100644 --- 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 index 4c38e453b..000000000 --- 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 38cdd3acb..2eb6e1577 100644 --- 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 index 1efef5c62..000000000 --- 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\""