From: Numan Siddique <nusid...@redhat.com> For the other header files present in lib/, the previous commit [1] changed the path. But few were left out. This patch fixes them too.
[1] - a469954c00c4("Include ovn header files from lib/ instead of ovn/lib/") Signed-off-by: Numan Siddique <nusid...@redhat.com> --- v1 -> v2 ======= * Addressed Dumitru's comments and updated lib/chassis-index.c Makefile.am | 2 ++ lib/chassis-index.c | 4 ++-- lib/ip-mcast-index.c | 4 ++-- lib/ovn-sb-idl.ann | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index e3dea1912..4fe0d2899 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,8 @@ AM_CPPFLAGS = $(SSL_CFLAGS) AM_LDFLAGS = $(SSL_LDFLAGS) AM_LDFLAGS += $(OVS_LDFLAGS) +AM_CPPFLAGS += -I $(top_srcdir)/include + if WIN32 AM_CPPFLAGS += -I $(top_srcdir)/ovs/include AM_CPPFLAGS += -I $(top_srcdir)/ovs/lib diff --git a/lib/chassis-index.c b/lib/chassis-index.c index 10f70fb4a..39066f4cc 100644 --- a/lib/chassis-index.c +++ b/lib/chassis-index.c @@ -13,8 +13,8 @@ */ #include <config.h> -#include "ovn/lib/chassis-index.h" -#include "ovn/lib/ovn-sb-idl.h" +#include "lib/chassis-index.h" +#include "lib/ovn-sb-idl.h" struct ovsdb_idl_index * chassis_index_create(struct ovsdb_idl *idl) diff --git a/lib/ip-mcast-index.c b/lib/ip-mcast-index.c index 1f6ebc4ae..6b01041cc 100644 --- a/lib/ip-mcast-index.c +++ b/lib/ip-mcast-index.c @@ -15,8 +15,8 @@ #include <config.h> -#include "ovn/lib/ip-mcast-index.h" -#include "ovn/lib/ovn-sb-idl.h" +#include "lib/ip-mcast-index.h" +#include "lib/ovn-sb-idl.h" struct ovsdb_idl_index * ip_mcast_index_create(struct ovsdb_idl *idl) diff --git a/lib/ovn-sb-idl.ann b/lib/ovn-sb-idl.ann index e51238b92..22124b868 100644 --- a/lib/ovn-sb-idl.ann +++ b/lib/ovn-sb-idl.ann @@ -6,9 +6,9 @@ # it can generate more programmer-friendly data structures. s["idlPrefix"] = "sbrec_" -s["idlHeader"] = "\"ovn/lib/ovn-sb-idl.h\"" +s["idlHeader"] = "\"lib/ovn-sb-idl.h\"" -s["hDecls"] = '#include "ovn/lib/ovn-util.h"' +s["hDecls"] = '#include "lib/ovn-util.h"' # Adds an integer column named 'column' to 'table' in 's'. The column # values is calculated with 'expression' based on the values of the columns -- 2.21.0 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev