BUILD: ot: removed explicit include path when building opentracing filter

The -Iaddons/ot/include flag in OT_CFLAGS allowed source files to use a
bare #include "include.h", which was fragile because it depended on the
compiler search path.  Removed that flag from the Makefile and changed
every source file under addons/ot/src/ to use the relative include path
../include/include.h instead.  This made header resolution explicit and
consistent with standard addon conventions.

diff --git a/addons/ot/Makefile b/addons/ot/Makefile
index 5bf8d9e8ed12e16d290c885085910d0e81d6a517..4163291994baea78d623d714b4f0f1d08801a03a 100644 (file)
--- a/addons/ot/Makefile
+++ b/addons/ot/Makefile
@@ -70,4 +70,4 @@ OPTIONS_OBJS += \
        addons/ot/src/vars.o
 endif
 
-OT_CFLAGS := $(OT_CFLAGS) -Iaddons/ot/include $(OT_DEFINE)
+OT_CFLAGS := $(OT_CFLAGS) $(OT_DEFINE)

diff --git a/addons/ot/src/cli.c b/addons/ot/src/cli.c
index 0080dbd436e26d5b77deae8943d729df3c578a53..7bf588f0a8be5da648746d80371d389751f52aca 100644 (file)
--- a/addons/ot/src/cli.c
+++ b/addons/ot/src/cli.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 /***

diff --git a/addons/ot/src/conf.c b/addons/ot/src/conf.c
index c6375a6b3b95d22b25d21c4186e91df175a8c258..789c86a35e02e3fd8d8ca2aa953904228cd794d8 100644 (file)
--- a/addons/ot/src/conf.c
+++ b/addons/ot/src/conf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 /***

diff --git a/addons/ot/src/event.c b/addons/ot/src/event.c
index dc29d52a220fdc4361c1aac6806571b152fe5bd5..827b70929917e0c0a069daeb7adebbae57a0a524 100644 (file)
--- a/addons/ot/src/event.c
+++ b/addons/ot/src/event.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 #define FLT_OT_EVENT_DEF(a,b,c,d,e,f)   { AN_##b##_##a, SMP_OPT_DIR_##b, SMP_VAL_FE_##c, SMP_VAL_BE_##d, e, f },

diff --git a/addons/ot/src/filter.c b/addons/ot/src/filter.c
index 20d61d9813f9052da98dabf9d81f41cc0f179b91..0ae542eb4771c65a3e4a9c8235f4791a2545261e 100644 (file)
--- a/addons/ot/src/filter.c
+++ b/addons/ot/src/filter.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 /*

diff --git a/addons/ot/src/group.c b/addons/ot/src/group.c
index 52b872dcc25302d346d9feb2d294572d3552905a..6798e8a539fae99afe6965e8101e3e0497433b93 100644 (file)
--- a/addons/ot/src/group.c
+++ b/addons/ot/src/group.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 #define FLT_OT_GROUP_DEF(a,b,c)   { a, b, c },

diff --git a/addons/ot/src/http.c b/addons/ot/src/http.c
index 517bd0de343f912a2d5596e7ca56c0263c63333c..0a3572af4f4cf1d00db57b2bc54985ff2450ac63 100644 (file)
--- a/addons/ot/src/http.c
+++ b/addons/ot/src/http.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 #ifdef DEBUG_OT

diff --git a/addons/ot/src/opentracing.c b/addons/ot/src/opentracing.c
index 8ae5f021c98dd292d3bbc5e7b2e02d538e18f4f5..60b71d9b2196436c93a35c79b257e9d31384ad51 100644 (file)
--- a/addons/ot/src/opentracing.c
+++ b/addons/ot/src/opentracing.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 static struct pool_head *pool_head_ot_span_context __read_mostly = NULL;

diff --git a/addons/ot/src/parser.c b/addons/ot/src/parser.c
index c59a18418769b72c6c320c53ec4be3500742f13c..f3b4df3f1db5c8afaee760e4ceeac836bbaf4928 100644 (file)
--- a/addons/ot/src/parser.c
+++ b/addons/ot/src/parser.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 #ifdef DEBUG_OT

diff --git a/addons/ot/src/pool.c b/addons/ot/src/pool.c
index fbcdbfc2190057daf0b3becfec124908d27cfa70..fdf7235dddb53daf5ab524e49528edd7bbd5817b 100644 (file)
--- a/addons/ot/src/pool.c
+++ b/addons/ot/src/pool.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 /***

diff --git a/addons/ot/src/scope.c b/addons/ot/src/scope.c
index 8a4c02f3cfbd6417b5561787638e290206db93d5..d787caabfb9c2703abc184510da151eafeda8e43 100644 (file)
--- a/addons/ot/src/scope.c
+++ b/addons/ot/src/scope.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 static struct pool_head *pool_head_ot_scope_span __read_mostly = NULL;

diff --git a/addons/ot/src/util.c b/addons/ot/src/util.c
index fd040164d55f2ad71d3caf33b42c8dd23d71f3e0..fee6d377f67384def44cf7ea7009cb0cd89980c3 100644 (file)
--- a/addons/ot/src/util.c
+++ b/addons/ot/src/util.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 #ifdef DEBUG_OT

diff --git a/addons/ot/src/vars.c b/addons/ot/src/vars.c
index e0c6923c4d41ba7d7163e9f2a57122794362b84a..c8d54389de4eaa491845c8b2309b6b909e2e59c4 100644 (file)
--- a/addons/ot/src/vars.c
+++ b/addons/ot/src/vars.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#include "include.h"
+#include "../include/include.h"
 
 
 #ifdef DEBUG_OT