[LTP] [PATCH] include/lapi: add leaf Makefile

[LTP] [PATCH] include/lapi: add leaf Makefile

[Jinseok Kim]

Fixes : https://github.com/linux-test-project/ltp/issues/1262

include/lapi and include/lapi/syscalls lack Makefiles, so 'make check'
does not work in these directories. Add minimal leaf Makefiles.

Signed-off-by: Jinseok Kim <always.starving0@gmail.com>
---
 include/lapi/Makefile          | 8 ++++++++
 include/lapi/syscalls/Makefile | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 include/lapi/Makefile
 create mode 100644 include/lapi/syscalls/Makefile

diff --git a/include/lapi/Makefile b/include/lapi/Makefile
new file mode 100644
index 000000000..83ef85c77
--- /dev/null
+++ b/include/lapi/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
+
+top_srcdir              ?= ../../
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/include/lapi/syscalls/Makefile b/include/lapi/syscalls/Makefile
new file mode 100644
index 000000000..e46c90ef5
--- /dev/null
+++ b/include/lapi/syscalls/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
+
+top_srcdir              ?= ../../../
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
--
2.43.0

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Li Wang]

Jinseok Kim <always.starving0@gmail.com> wrote:

> Fixes : https://github.com/linux-test-project/ltp/issues/1262
>
> include/lapi and include/lapi/syscalls lack Makefiles, so 'make check'
> does not work in these directories. Add minimal leaf Makefiles.
>
> Signed-off-by: Jinseok Kim <always.starving0@gmail.com>

Reviewed-by: Li Wang <wangli.ahau@gmail.com>

-- 
Regards,
Li Wang
Email: wangli.ahau@gmail.com

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Petr Vorel]

Hi Jinseok,

Thanks for fixing this!

> Fixes : https://github.com/linux-test-project/ltp/issues/1262

nit: Please next time avoid space before ':'.

Fixes: https://github.com/linux-test-project/ltp/issues/1262

> include/lapi and include/lapi/syscalls lack Makefiles, so 'make check'
> does not work in these directories. Add minimal leaf Makefiles.

nit: Also it'd go here.

> Signed-off-by: Jinseok Kim <always.starving0@gmail.com>
> ---
>  include/lapi/Makefile          | 8 ++++++++
>  include/lapi/syscalls/Makefile | 8 ++++++++
>  2 files changed, 16 insertions(+)
>  create mode 100644 include/lapi/Makefile
>  create mode 100644 include/lapi/syscalls/Makefile

> diff --git a/include/lapi/Makefile b/include/lapi/Makefile
> new file mode 100644
> index 000000000..83ef85c77
> --- /dev/null
> +++ b/include/lapi/Makefile
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
> +
> +top_srcdir              ?= ../../
> +
> +include $(top_srcdir)/include/mk/env_pre.mk
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/include/lapi/syscalls/Makefile b/include/lapi/syscalls/Makefile

> new file mode 100644
> index 000000000..e46c90ef5
> --- /dev/null
> +++ b/include/lapi/syscalls/Makefile
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
> +
> +top_srcdir              ?= ../../../
> +
> +include $(top_srcdir)/include/mk/env_pre.mk
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk

Why do we need this file? This one should be deleted. Also, because make install
works for include directory, it should work here as well.
I would just copy that header, update top_srcdir location and also include
generic_trunk_target.mk to include/Makefile.

I think this is a better version.

Kind regards,
Petr

diff --git include/Makefile include/Makefile
index 6b31b046e4..84cd4ed6e3 100644
--- include/Makefile
+++ include/Makefile
@@ -24,4 +24,4 @@ ac-maintainer-clean:: ac-clean
 
 vpath %.h $(abs_srcdir)
 
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git include/lapi/Makefile include/lapi/Makefile
index 83ef85c77c..2a66e5aff6 100644
--- include/lapi/Makefile
+++ include/lapi/Makefile
@@ -1,8 +1,28 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
+# Copyright (C) 2009, Cisco Systems Inc.
+# Copyright (c) Linux Test Project, 2026
+# Ngie Cooper, July 2009
 
-top_srcdir              ?= ../../
+top_srcdir		?= ../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 
+INSTALL_DIR		:= $(includedir)/lapi
+
+INSTALL_MODE		:= 00644
+
+INSTALL_TARGETS		:= *.h
+
+MAKE_TARGETS		:=
+
+.PHONY: ac-clean ac-distclean ac-maintainer-clean distclean maintainer-clean
+distclean:: clean ac-distclean
+maintainer-clean:: distclean ac-maintainer-clean
+ac-clean ac-distclean::
+	$(RM) -f config.h lapi/syscalls.h stamp-h1
+ac-maintainer-clean:: ac-clean
+	$(RM) -f config.h.in
+
+vpath %.h $(abs_srcdir)
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git include/lapi/syscalls/Makefile include/lapi/syscalls/Makefile
deleted file mode 100644
index e46c90ef5f..0000000000
--- include/lapi/syscalls/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
-
-top_srcdir              ?= ../../../
-
-include $(top_srcdir)/include/mk/env_pre.mk
-
-include $(top_srcdir)/include/mk/generic_leaf_target.mk

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Li Wang]

On Tue, Apr 14, 2026 at 5:20 AM Petr Vorel <pvorel@suse.cz> wrote:
>
> Hi Jinseok,
>
> Thanks for fixing this!
>
> > Fixes : https://github.com/linux-test-project/ltp/issues/1262
>
> nit: Please next time avoid space before ':'.
>
> Fixes: https://github.com/linux-test-project/ltp/issues/1262
>
> > include/lapi and include/lapi/syscalls lack Makefiles, so 'make check'
> > does not work in these directories. Add minimal leaf Makefiles.
>
> nit: Also it'd go here.
>
> > Signed-off-by: Jinseok Kim <always.starving0@gmail.com>
> > ---
> >  include/lapi/Makefile          | 8 ++++++++
> >  include/lapi/syscalls/Makefile | 8 ++++++++
> >  2 files changed, 16 insertions(+)
> >  create mode 100644 include/lapi/Makefile
> >  create mode 100644 include/lapi/syscalls/Makefile
>
> > diff --git a/include/lapi/Makefile b/include/lapi/Makefile
> > new file mode 100644
> > index 000000000..83ef85c77
> > --- /dev/null
> > +++ b/include/lapi/Makefile
> > @@ -0,0 +1,8 @@
> > +# SPDX-License-Identifier: GPL-2.0-or-later
> > +# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
> > +
> > +top_srcdir              ?= ../../
> > +
> > +include $(top_srcdir)/include/mk/env_pre.mk
> > +
> > +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> > diff --git a/include/lapi/syscalls/Makefile b/include/lapi/syscalls/Makefile
>
> > new file mode 100644
> > index 000000000..e46c90ef5
> > --- /dev/null
> > +++ b/include/lapi/syscalls/Makefile
> > @@ -0,0 +1,8 @@
> > +# SPDX-License-Identifier: GPL-2.0-or-later
> > +# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
> > +
> > +top_srcdir              ?= ../../../
> > +
> > +include $(top_srcdir)/include/mk/env_pre.mk
> > +
> > +include $(top_srcdir)/include/mk/generic_leaf_target.mk
>
> Why do we need this file? This one should be deleted. Also, because make install
> works for include directory, it should work here as well.
> I would just copy that header, update top_srcdir location and also include
> generic_trunk_target.mk to include/Makefile.
>
> I think this is a better version.

Yes, this solution looks smarter, but tiny queries below.

> ...
>  include $(top_srcdir)/include/mk/env_pre.mk
>
> +INSTALL_DIR            := $(includedir)/lapi

I'm doubting should we install the include/lapi/ local header files to
the /opt/ltp/include?

> ...
> --- include/lapi/syscalls/Makefile
> +++ /dev/null

Does the `make check` still work (inside include/lapi/syscalls/)
without this Makefile?

-- 
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH] include/lapi: add leaf Makefile

[Jinseok Kim]

Hi,

Thanks for the review!

If we switch to generic_trunk, the current directory is not checked;
only subdirectories are traversed.

For example, running `make check` in include/ will descend into
include/lapi, and running `make check` in include/lapi will descend
into include/lapi/syscalls.

Thanks,
Jinseok.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Petr Vorel]

Hi Li,

[ Cc Cyril if he wants to add his 2 cents ]

> On Tue, Apr 14, 2026 at 5:20 AM Petr Vorel <pvorel@suse.cz> wrote:

> > Hi Jinseok,

> > Thanks for fixing this!

> > > Fixes : https://github.com/linux-test-project/ltp/issues/1262

> > nit: Please next time avoid space before ':'.

> > Fixes: https://github.com/linux-test-project/ltp/issues/1262

> > > include/lapi and include/lapi/syscalls lack Makefiles, so 'make check'
> > > does not work in these directories. Add minimal leaf Makefiles.

> > nit: Also it'd go here.

> > > Signed-off-by: Jinseok Kim <always.starving0@gmail.com>
> > > ---
> > >  include/lapi/Makefile          | 8 ++++++++
> > >  include/lapi/syscalls/Makefile | 8 ++++++++
> > >  2 files changed, 16 insertions(+)
> > >  create mode 100644 include/lapi/Makefile
> > >  create mode 100644 include/lapi/syscalls/Makefile

> > > diff --git a/include/lapi/Makefile b/include/lapi/Makefile
> > > new file mode 100644
> > > index 000000000..83ef85c77
> > > --- /dev/null
> > > +++ b/include/lapi/Makefile
> > > @@ -0,0 +1,8 @@
> > > +# SPDX-License-Identifier: GPL-2.0-or-later
> > > +# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
> > > +
> > > +top_srcdir              ?= ../../
> > > +
> > > +include $(top_srcdir)/include/mk/env_pre.mk
> > > +
> > > +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> > > diff --git a/include/lapi/syscalls/Makefile b/include/lapi/syscalls/Makefile

> > > new file mode 100644
> > > index 000000000..e46c90ef5
> > > --- /dev/null
> > > +++ b/include/lapi/syscalls/Makefile
> > > @@ -0,0 +1,8 @@
> > > +# SPDX-License-Identifier: GPL-2.0-or-later
> > > +# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
> > > +
> > > +top_srcdir              ?= ../../../
> > > +
> > > +include $(top_srcdir)/include/mk/env_pre.mk
> > > +
> > > +include $(top_srcdir)/include/mk/generic_leaf_target.mk

> > Why do we need this file? This one should be deleted. Also, because make install
> > works for include directory, it should work here as well.
> > I would just copy that header, update top_srcdir location and also include
> > generic_trunk_target.mk to include/Makefile.

> > I think this is a better version.

> Yes, this solution looks smarter, but tiny queries below.

> > ...
> >  include $(top_srcdir)/include/mk/env_pre.mk

> > +INSTALL_DIR            := $(includedir)/lapi

> I'm doubting should we install the include/lapi/ local header files to
> the /opt/ltp/include?

Do you question *whether* install lapi/*.h or *where* to install them?
We install include/*.h files. What is a difference with include/lapi/?

I'd say either install both or none. I would prefer to not install any,
LTP library is not separated anyway (there is an old Andrea's effort, but that
uses meson anyway). Installation was added in 2008 and I doubt anybody is using
it.

> > ...
> > --- include/lapi/syscalls/Makefile
> > +++ /dev/null

> Does the `make check` still work (inside include/lapi/syscalls/)
> without this Makefile?

Sure not. Do we really want to check generate_arch.sh and generate_syscalls.sh
in arch? If yes, sure it needs to be added, but that was not my intention when
creating #1262. I really wanted to check C (and shell) library and tests code.

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Petr Vorel]

Hi Jinseok,

> Hi,

> Thanks for the review!
Yw.

> If we switch to generic_trunk, the current directory is not checked;
> only subdirectories are traversed.

FYI by this I meant this change (part of more changes stated previously):

diff --git include/Makefile include/Makefile
index 6b31b046e4..84cd4ed6e3 100644
--- include/Makefile
+++ include/Makefile
@@ -24,4 +24,4 @@ ac-maintainer-clean:: ac-clean

 vpath %.h $(abs_srcdir)

-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+include $(top_srcdir)/include/mk/generic_trunk_target.mk

> For example, running `make check` in include/ will descend into
> include/lapi, and running `make check` in include/lapi will descend
> into include/lapi/syscalls.

And with that change make check in include works:

ltp/include $ make check-tst_fs.h
CHECK include/tst_fs.h
tst_fs.h:83: CHECK: 'swtich' may be misspelled - perhaps 'switch'?
tst_fs.h:157: WARNING: please, no spaces at the start of a line
tst_fs.h:157: WARNING: Prefer __printf(1, 2) over __attribute__((format(printf, 1, 2)))
make: [../include/mk/rules.mk:69: check-tst_fs.h] Error 1 (ignored)

ltp/include/lapi $ make check-tls.h
CHECK include/lapi/tls.h
tls.h:1: WARNING: Improper SPDX comment style for 'tls.h', please use '/*' instead
tls.h:1: WARNING: Missing or malformed SPDX-License-Identifier tag in line 1
tls.h:35: WARNING: do not add new typedefs
tls.h:49: WARNING: Missing a blank line after declarations
tls.h:56: WARNING: Missing a blank line after declarations
make: [../../include/mk/rules.mk:69: check-tls.h] Error 1 (ignored)

Kind regards,
Petr

> Thanks,
> Jinseok.

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Li Wang]

Petr Vorel <pvorel@suse.cz> wrote:

> > > +INSTALL_DIR            := $(includedir)/lapi
>
> > I'm doubting should we install the include/lapi/ local header files to
> > the /opt/ltp/include?
>
> Do you question *whether* install lapi/*.h or *where* to install them?
> We install include/*.h files. What is a difference with include/lapi/?

The former, I guess we don't need to install any.

> I'd say either install both or none. I would prefer to not install any,
> LTP library is not separated anyway (there is an old Andrea's effort, but that
> uses meson anyway). Installation was added in 2008 and I doubt anybody is using
> it.

Yes, that was exactly my point, we'd better remove the INSTALL_* part
from the Makefile you posted.

-INSTALL_DIR            := $(includedir)/lapi
-
-INSTALL_MODE           := 00644
-
-INSTALL_TARGETS                := *.h

> > > --- include/lapi/syscalls/Makefile
> > > +++ /dev/null
>
> > Does the `make check` still work (inside include/lapi/syscalls/)
> > without this Makefile?
>
> Sure not. Do we really want to check generate_arch.sh and generate_syscalls.sh
> in arch? If yes, sure it needs to be added, but that was not my intention when
> creating #1262. I really wanted to check C (and shell) library and tests code.

I'm ok with both, so without that Makefile we could do `make check` in
/include/lapi/.


-- 
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Li Wang]

> Yes, that was exactly my point, we'd better remove the INSTALL_* part
> from the Makefile you posted.
>
> -INSTALL_DIR            := $(includedir)/lapi
> -
> -INSTALL_MODE           := 00644
> -
> -INSTALL_TARGETS                := *.h

And we even don't need the additional clean targets, for the make-check
which just simply:

--- a/include/Makefile
+++ b/include/Makefile
@@ -24,4 +24,4 @@ ac-maintainer-clean:: ac-clean

 vpath %.h $(abs_srcdir)

-include $(top_srcdir)/include/mk/generic_leaf_target.mk
+include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/include/lapi/Makefile b/include/lapi/Makefile
new file mode 100644
index 0000000..83ef85c
--- /dev/null
+++ b/include/lapi/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
+
+top_srcdir              ?= ../../
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk


-- 
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Petr Vorel]

> Petr Vorel <pvorel@suse.cz> wrote:

> > > > +INSTALL_DIR            := $(includedir)/lapi

> > > I'm doubting should we install the include/lapi/ local header files to
> > > the /opt/ltp/include?

> > Do you question *whether* install lapi/*.h or *where* to install them?
> > We install include/*.h files. What is a difference with include/lapi/?

> The former, I guess we don't need to install any.

+1

> > I'd say either install both or none. I would prefer to not install any,
> > LTP library is not separated anyway (there is an old Andrea's effort, but that
> > uses meson anyway). Installation was added in 2008 and I doubt anybody is using
> > it.

> Yes, that was exactly my point, we'd better remove the INSTALL_* part
> from the Makefile you posted.

> -INSTALL_DIR            := $(includedir)/lapi
> -
> -INSTALL_MODE           := 00644
> -
> -INSTALL_TARGETS                := *.h

+1, let's drop it. Ideally as a separate patch in include/Makefile, so that
include/lapi/Makefile can be based on it. Maybe we could even have a template in
include/mk/ instead of copypasting (when now we will not have INSTALL_*, but I
don't require it (it's just 2x Makefile, they can be copy pasted).


> > > > --- include/lapi/syscalls/Makefile
> > > > +++ /dev/null

> > > Does the `make check` still work (inside include/lapi/syscalls/)
> > > without this Makefile?

> > Sure not. Do we really want to check generate_arch.sh and generate_syscalls.sh
> > in arch? If yes, sure it needs to be added, but that was not my intention when
> > creating #1262. I really wanted to check C (and shell) library and tests code.

> I'm ok with both, so without that Makefile we could do `make check` in
> /include/lapi/.

+1.

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] include/lapi: add leaf Makefile

[Petr Vorel]

Hi Li,

> > Yes, that was exactly my point, we'd better remove the INSTALL_* part
> > from the Makefile you posted.

> > -INSTALL_DIR            := $(includedir)/lapi
> > -
> > -INSTALL_MODE           := 00644
> > -
> > -INSTALL_TARGETS                := *.h

> And we even don't need the additional clean targets, for the make-check
> which just simply:

> --- a/include/Makefile
> +++ b/include/Makefile
> @@ -24,4 +24,4 @@ ac-maintainer-clean:: ac-clean

>  vpath %.h $(abs_srcdir)

> -include $(top_srcdir)/include/mk/generic_leaf_target.mk
> +include $(top_srcdir)/include/mk/generic_trunk_target.mk
> diff --git a/include/lapi/Makefile b/include/lapi/Makefile
> new file mode 100644
> index 0000000..83ef85c
> --- /dev/null
> +++ b/include/lapi/Makefile
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +# Copyright (C) 2026 Jinseok Kim <always.starving0@gmail.com>
> +
> +top_srcdir              ?= ../../
> +
> +include $(top_srcdir)/include/mk/env_pre.mk
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk

+1 (+ deleted that INSTALL_* variables).

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp