| Message ID | 20201008071858.96786-1-sztsian@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Documentation: Fix include level of Makefile scripts | expand |
Note, this patch is for libtraceevent. And I think it makes more sense to port the missing scripts/utilities.mak by the maintainer rather than sending a patchset with lots of historical commits from kernel, so I did not include that part here. HTH. On 10/8/20 3:18 PM, sztsian@gmail.com wrote: > From: "Ziqian SUN (Zamir)" <sztsian@gmail.com> > > Compiling the docs with `make doc` will result in > > Makefile:2: ../../../scripts/utilities.mak: No such file or directory > > This is caused by: > * The reference should be two level up, rather than three > * The utilities.mak is missing when fork the library out > > This patch fixes the first issue by adjusting the include level. And I > think the porting of utilities.mak is better to be done separately. > > Signed-off-by: Ziqian SUN (Zamir) <sztsian@gmail.com> > --- > Documentation/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/Makefile b/Documentation/Makefile > index aa72ab9..edb8623 100644 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -1,5 +1,5 @@ > -include ../../../scripts/Makefile.include > -include ../../../scripts/utilities.mak > +include ../scripts/Makefile.include > +include ../scripts/utilities.mak > > # This Makefile and manpage XSL files were taken from tools/perf/Documentation > # and modified for libtraceevent. >
On Thu, 8 Oct 2020 15:30:08 +0800 Zamir SUN <sztsian@gmail.com> wrote: > Note, this patch is for libtraceevent. > > And I think it makes more sense to port the missing > scripts/utilities.mak by the maintainer rather than sending a patchset > with lots of historical commits from kernel, so I did not include that > part here. > > HTH. Thanks! I reverted the copy and brought over the history of the Makefiles, scripts and include headers. I also included utilities.mak. When this becomes something that can be installed as a package, I'll give it an official tag: libtraceevent-v1.1.0 -- Steve
On 10/9/20 10:54 PM, Steven Rostedt wrote: > On Thu, 8 Oct 2020 15:30:08 +0800 > Zamir SUN <sztsian@gmail.com> wrote: > >> Note, this patch is for libtraceevent. >> >> And I think it makes more sense to port the missing >> scripts/utilities.mak by the maintainer rather than sending a patchset >> with lots of historical commits from kernel, so I did not include that >> part here. >> >> HTH. > > Thanks! > > I reverted the copy and brought over the history of the Makefiles, scripts > and include headers. I also included utilities.mak. > > When this becomes something that can be installed as a package, I'll give > it an official tag: libtraceevent-v1.1.0 > Hi Steve, Thanks. As of the following commit, I can compile the library without extra patch now. commit 5dd505f3aba255c5fbc2a6dbed57fcba51b400f6 (origin/libtraceevent, origin/HEAD) Author: Steven Rostedt (VMware) <rostedt@goodmis.org> Date: Fri Oct 9 10:56:07 2020 -0400 lib traceevent: Remove trace-cmd references from Makefile
diff --git a/Documentation/Makefile b/Documentation/Makefile index aa72ab9..edb8623 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,5 +1,5 @@ -include ../../../scripts/Makefile.include -include ../../../scripts/utilities.mak +include ../scripts/Makefile.include +include ../scripts/utilities.mak # This Makefile and manpage XSL files were taken from tools/perf/Documentation # and modified for libtraceevent.