poke-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Makefile rules indentation


From: Jose E. Marchesi
Subject: Re: Makefile rules indentation
Date: Wed, 14 Feb 2024 16:57:12 +0100
User-agent: Gnus/5.13 (Gnus v5.13)

Hi Bruno.

This is OK for both master and maint/poke-4.
Thanks!

> In Makefiles, lines that contain shell command for a rule need to start with a
> tab character. Makefile.ams, since they produce Makefiles, inherit the same
> constraint. I encountered a (non-GNU) 'make' program that requires this,
> not too long ago.
>
> Here's a proposed patch for poke.
>
>>From f47c9ab5255b2159b4535e47dadce96816639d79 Mon Sep 17 00:00:00 2001
> From: Bruno Haible <bruno@clisp.org>
> Date: Wed, 14 Feb 2024 16:49:59 +0100
> Subject: [PATCH] Makefile rules indentation.
>
> * doc/Makefile.am: Start each rule command line with a tab.
> * libpoke/Makefile.am: Likewise.
> * testsuite/Makefile.am: Likewise.
> ---
>  doc/Makefile.am       |  2 +-
>  libpoke/Makefile.am   |  8 ++++----
>  testsuite/Makefile.am | 22 +++++++++++-----------
>  3 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index fb037793..3b7df4af 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -49,7 +49,7 @@ else
>  
>  poke-settings.texi:
>       echo "Settings documentation not generated in cross-build." \
> -          > poke-settings.texi
> +       > poke-settings.texi
>  
>  endif
>  
> diff --git a/libpoke/Makefile.am b/libpoke/Makefile.am
> index fe82dc59..6eff76b1 100644
> --- a/libpoke/Makefile.am
> +++ b/libpoke/Makefile.am
> @@ -84,7 +84,7 @@ endif HAVE_PROC
>  .pks.pkc:
>       if test "$(RAS_AWK)" = ":"; then \
>         echo "your AWK is not powerful enough.  Please install gawk" \
> -          1>&2 && exit 1 || : ; \
> +       1>&2 && exit 1 || : ; \
>       fi
>       outfile=`basename "$@"`; \
>       srcdir=$(srcdir) $(RAS_AWK) -f $(srcdir)/ras $< > $$outfile.tmp \
> @@ -103,9 +103,9 @@ BUILT_SOURCES = pkl-gen.pkc pkl-gen-builtins.pkc 
> pkl-gen-attrs.pkc pkl-asm.pkc
>  pkl-keywords.def: $(srcdir)/pkl-lex.l
>       outfile=`basename "$@"`; \
>       $(AWK) \
> -'/BEGINNING OF KEYWORDS/,/END OF KEYWORDS/ { if ($$1 != "/*") print 
> "PKL_DEF_KEYWORD(" $$1 ")"; }' \
> -          < $< > $$outfile.tmp \
> -        && mv $$outfile.tmp $(srcdir)/$$outfile
> +     '/BEGINNING OF KEYWORDS/,/END OF KEYWORDS/ { if ($$1 != "/*") print 
> "PKL_DEF_KEYWORD(" $$1 ")"; }' \
> +       < $< > $$outfile.tmp \
> +     && mv $$outfile.tmp $(srcdir)/$$outfile
>  
>  EXTRA_DIST += pkl-keywords.def
>  MOSTLYCLEANFILES += pkl-keywords.def.tmp
> diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
> index e051fc5a..abd33ed5 100644
> --- a/testsuite/Makefile.am
> +++ b/testsuite/Makefile.am
> @@ -27,18 +27,18 @@ if HAVE_DEJAGNU
>         CC_FOR_TARGET="$(CC_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS)" \
>         HAVE_LIBTEXTSTYLE="$(HAVE_LIBTEXTSTYLE)" \
>         NBDKIT="$(NBDKIT)" \
> -          INPUTRC="$(top_builddir)/inputrc" \
> -          POKESTYLESDIR="$(top_srcdir)/etc" \
> -          POKEPICKLESDIR="$(top_srcdir)/pickles" \
> -          POKEAPPDIR="$(top_srcdir)/poke" \
> -          POKEDATADIR="$(top_srcdir)/libpoke" \
> -          POKECONFIGDIR="$(top_builddir)/libpoke" \
> -          POKECMDSDIR="$(top_srcdir)/poke" \
> -          POKEDOCDIR="$(top_builddir)/doc" \
> -          POKE_LOAD_PATH="$(top_srcdir)/poke" \
> -          POKEFMTAPPDIR="$(top_srcdir)/pokefmt" \
> +       INPUTRC="$(top_builddir)/inputrc" \
> +       POKESTYLESDIR="$(top_srcdir)/etc" \
> +       POKEPICKLESDIR="$(top_srcdir)/pickles" \
> +       POKEAPPDIR="$(top_srcdir)/poke" \
> +       POKEDATADIR="$(top_srcdir)/libpoke" \
> +       POKECONFIGDIR="$(top_builddir)/libpoke" \
> +       POKECMDSDIR="$(top_srcdir)/poke" \
> +       POKEDOCDIR="$(top_builddir)/doc" \
> +       POKE_LOAD_PATH="$(top_srcdir)/poke" \
> +       POKEFMTAPPDIR="$(top_srcdir)/pokefmt" \
>               $$runtest --tool $(DEJATOOL) --srcdir $${srcdir} --objdir 
> $(builddir) \
> -                        SHELL="$(SHELL)" \
> +                     SHELL="$(SHELL)" \
>                       $(RUNTESTFLAGS) || exit $$1; \
>         rm -f $(top_builddir)/inputrc; \
>       else \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]