[ovs-dev] [PATCH ovn] Include common ovn header files from include/ovn instead of ovs/include/ovn

Dumitru Ceara dceara at redhat.com
Mon Jul 29 10:29:58 UTC 2019


On Mon, Jul 29, 2019 at 12:02 PM <nusiddiq at redhat.com> wrote:
>
> From: Numan Siddique <nusiddiq at 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 <nusiddiq at redhat.com>

Hi Numan,

I think these two got missed too:
lib/chassis-index.c
lib/chassis-index.h

Thanks,
Dumitru

> ---
>  Makefile.am          | 2 ++
>  lib/ip-mcast-index.c | 4 ++--
>  lib/ovn-sb-idl.ann   | 4 ++--
>  3 files changed, 6 insertions(+), 4 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/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
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev


More information about the dev mailing list