[ovs-dev] [PATCH ovn 8/8] Makefile: Ensure OVN include directories come before OVS ones.

Ben Pfaff blp at ovn.org
Thu Oct 22 03:54:15 UTC 2020


Otherwise, when files present in both directories, the OVS ones are
chosen.  This is a problem if the OVS build tree has stray OVN headers
(because there was an build there that included OVN).

Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 610eb9f79a12..3bc31090396d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,8 @@ endif
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/ovn
 AM_CPPFLAGS += -I $(top_builddir)/include
+AM_CPPFLAGS += -I $(top_srcdir)/lib
+AM_CPPFLAGS += -I $(top_builddir)/lib
 
 AM_CPPFLAGS += -I $(OVS_SRCDIR)/include
 AM_CPPFLAGS += -I $(OVS_BUILDDIR)/include
@@ -43,8 +45,6 @@ AM_CPPFLAGS += -I $(OVS_SRCDIR)/lib
 AM_CPPFLAGS += -I $(OVS_BUILDDIR)/lib
 AM_CPPFLAGS += -I $(OVS_SRCDIR)
 AM_CPPFLAGS += -I $(OVS_BUILDDIR)
-AM_CPPFLAGS += -I $(top_srcdir)/lib
-AM_CPPFLAGS += -I $(top_builddir)/lib
 
 AM_CPPFLAGS += $(SSL_INCLUDES)
 
-- 
2.26.2



More information about the dev mailing list