From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx> trace-cmd now depends on the external libraries of both libtraceevent and libtracefs and uses pkg-config to find their headers. As pkg-config will find the full path to the headers, do not include parts of the path when including them, because they may change, and the hardcoded path in the code will not. Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> --- include/trace-cmd/trace-cmd.h | 4 ++-- lib/trace-cmd/include/private/trace-cmd-private.h | 2 +- lib/trace-cmd/trace-util.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h index 6984db863303..7fea4e017b26 100644 --- a/include/trace-cmd/trace-cmd.h +++ b/include/trace-cmd/trace-cmd.h @@ -6,8 +6,8 @@ #ifndef _TRACE_CMD_H #define _TRACE_CMD_H -#include "traceevent/event-parse.h" -#include "tracefs/tracefs.h" +#include "event-parse.h" +#include "tracefs.h" struct tracecmd_input; diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h index 6440084ddd9d..c58b09e9da48 100644 --- a/lib/trace-cmd/include/private/trace-cmd-private.h +++ b/lib/trace-cmd/include/private/trace-cmd-private.h @@ -8,7 +8,7 @@ #include <fcntl.h> /* for iovec */ #include <sys/types.h> -#include "traceevent/event-parse.h" +#include "event-parse.h" #include "trace-cmd/trace-cmd.h" #define __packed __attribute__((packed)) diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c index b0c98c724363..9bc948224732 100644 --- a/lib/trace-cmd/trace-util.c +++ b/lib/trace-cmd/trace-util.c @@ -20,8 +20,8 @@ #include <sys/stat.h> #include <sys/sysinfo.h> #include <time.h> -#include <traceevent/event-parse.h> -#include <traceevent/event-utils.h> +#include <event-parse.h> +#include <event-utils.h> #include "trace-cmd-private.h" #include "trace-cmd-local.h" -- 2.30.2
|