Re: [PATCH] perf tools: Fix include paths in ui

[Ian Rogers]

Apologies, this was an accidental resend of a patch that's already
merged fa37bab6d7154658d8a35920513f9396587754cc.

Ian

On Wed, Sep 4, 2019 at 11:01 AM Ian Rogers <irogers@xxxxxxxxxx> wrote:
>
> These paths point to the wrong location but still work because they
> get picked up by a -I flag that happens to direct to the correct
> file. Fix paths to point to the correct location without -I flags.
>
> Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> ---
>  tools/perf/ui/browser.c      | 9 +++++----
>  tools/perf/ui/tui/progress.c | 2 +-
>  2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
> index f80c51d53565..d227d74b28f8 100644
> --- a/tools/perf/ui/browser.c
> +++ b/tools/perf/ui/browser.c
> @@ -1,7 +1,8 @@
>  // SPDX-License-Identifier: GPL-2.0
> -#include "../string2.h"
> -#include "../config.h"
> -#include "../../perf.h"
> +#include "../util/util.h"
> +#include "../util/string2.h"
> +#include "../util/config.h"
> +#include "../perf.h"
>  #include "libslang.h"
>  #include "ui.h"
>  #include "util.h"
> @@ -14,7 +15,7 @@
>  #include "browser.h"
>  #include "helpline.h"
>  #include "keysyms.h"
> -#include "../color.h"
> +#include "../util/color.h"
>  #include <linux/ctype.h>
>  #include <linux/zalloc.h>
>
> diff --git a/tools/perf/ui/tui/progress.c b/tools/perf/ui/tui/progress.c
> index bc134b82829d..5a24dd3ce4db 100644
> --- a/tools/perf/ui/tui/progress.c
> +++ b/tools/perf/ui/tui/progress.c
> @@ -1,6 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <linux/kernel.h>
> -#include "../cache.h"
> +#include "../../util/cache.h"
>  #include "../progress.h"
>  #include "../libslang.h"
>  #include "../ui.h"
> --
> 2.22.0.770.g0f2c4a37fd-goog
>