Re: [OSS-Tools] [PATCH platsch V4 2/4] convert to meson build

[Philipp Zabel <p.zabel@pengutronix.de>]

Hi,

On Fr, 2024-06-14 at 11:23 +0200, LI Qingwu wrote:
> Convert to meson build and update the README.rst

I'd note the version update to 2024.06.0 in the commit description.

> Signed-off-by: LI Qingwu <Qing-wu.Li@leica-geosystems.com.cn>
> ---
>  Makefile.am  | 23 -----------------------
>  README.rst   |  8 ++++++++
>  configure.ac | 13 -------------
>  meson.build  | 15 +++++++++++++++

Please also update .gitignore, I think none of the current entries are
needed anymore after this change.

>  4 files changed, 23 insertions(+), 36 deletions(-)
>  delete mode 100644 Makefile.am
>  delete mode 100644 configure.ac
>  create mode 100644 meson.build
> 
> diff --git a/Makefile.am b/Makefile.am
> deleted file mode 100644
> index d149ae0..0000000
> --- a/Makefile.am
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -EXTRA_DIST = README.rst LICENSE
> -
> -sbin_PROGRAMS = platsch
> -
> -platsch_SOURCES = platsch.c
> -platsch_CFLAGS = $(LIBDRM_CFLAGS)
> -platsch_LDADD = $(LIBDRM_LIBS)
> -
> -CLEANFILES = \
> -        $(DIST_ARCHIVES)
> -
> -DISTCLEAN = \
> -        config.log \
> -        config.status \
> -        Makefile
> -
> -MAINTAINERCLEANFILES = \
> -	aclocal.m4 \
> -	configure \
> -	depcomp \
> -	install-sh \
> -	Makefile.in \
> -	missing
> diff --git a/README.rst b/README.rst
> index e318120..f1c0812 100644
> --- a/README.rst
> +++ b/README.rst
> @@ -141,3 +141,11 @@ By adding a Signed-off-by line (e.g. using ``git commit -s``) saying::
>  
>  (using your real name and e-mail address), you state that your contributions
>  are in line with the DCO.
> +
> +Compiling Instructions
> +----------------------------
> +
> +.. code-block:: shell
> +
> +    meson setup build
> +    meson compile -C build
> diff --git a/configure.ac b/configure.ac
> deleted file mode 100644
> index 18878db..0000000
> --- a/configure.ac
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -AC_PREREQ([2.69])
> -AC_INIT([platsch], [2019.12.0], [oss-tools@pengutronix.de])
> -AC_CONFIG_SRCDIR([platsch.c])
> -AM_INIT_AUTOMAKE([foreign dist-xz])
> -
> -AC_PROG_CC
> -AC_PROG_MAKE_SET
> -
> -PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.4.112])
> -
> -AC_CONFIG_FILES([Makefile])
> -
> -AC_OUTPUT
> diff --git a/meson.build b/meson.build
> new file mode 100644
> index 0000000..0aadbe9
> --- /dev/null
> +++ b/meson.build
> @@ -0,0 +1,15 @@
> +project('platsch', 'c', version: '2024.06.0')

	license : '0BSD',

> +dep_libdrm = dependency('libdrm', version : '>= 2.4.112', required : true)

Drop "required : true", it is the default.

> +sources = ['platsch.c']
> +
> +# Define the headers
> +headers = ['platsch.h']

This is never used, and platsch.h doesn't exist. Just drop it.

> +
> +# Create the platsch executable

This comment doesn't add any valuable information, compared to the line
right below:

> +executable('platsch',
> +    sources,
> +    dependencies: dep_libdrm,
> +    install: true,

This was "sbin_PROGRAMS = platsch", so install to ${prefix}/sbin:

	install_dir : 'sbin',

> +    include_directories: include_directories('.')

This is not needed.

> +)

regards
Philipp