[PATCH v2 06/23] nscd: Re-flow and sort Makefile

[Carlos O'Donell]

On 3/20/26 4:41 PM, Florian Weimer wrote:

LGTM. Makes everything easier to edit too, and while it does change the order
of routines in the final compile, that shouldn't impact anything.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> ---
>   nscd/Makefile | 52 +++++++++++++++++++++++++++++++++++++++++----------
>   1 file changed, 42 insertions(+), 10 deletions(-)
> 
> diff --git a/nscd/Makefile b/nscd/Makefile
> index 649112488f..2578b00e27 100644
> --- a/nscd/Makefile
> +++ b/nscd/Makefile
> @@ -23,20 +23,52 @@ subdir	:= nscd
>   include ../Makeconfig
>   
>   ifneq ($(use-nscd),no)
> -routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
> -	    nscd_initgroups nscd_getserv_r nscd_netgroup
> -aux	:= nscd_helper
> -endif
> +routines := \
> +  nscd_getai \
> +  nscd_getgr_r \
> +  nscd_gethst_r \
> +  nscd_getpw_r \
> +  nscd_getserv_r \
> +  nscd_initgroups \
> +  nscd_netgroup \
> +  # routines
> +aux := \
> +  nscd_helper \
> +  # aux
> +endif # $(use-nscd)
>   
>   # To find xmalloc.c
>   vpath %.c ../locale/programs
>   
> -nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
> -		getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
> -		getsrvbynm_r getsrvbypt_r servicescache \
> -		dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
> -		xmalloc xstrdup aicache initgrcache res_hconf \
> -		netgroupcache cachedumper
> +nscd-modules := \
> +  aicache \
> +  cache \
> +  cachedumper \
> +  connections \
> +  dbg_log \
> +  getgrgid_r \
> +  getgrnam_r \
> +  gethstbyad_r \
> +  gethstbynm3_r \
> +  getpwnam_r \
> +  getpwuid_r \
> +  getsrvbynm_r \
> +  getsrvbypt_r \
> +  grpcache \
> +  hstcache \
> +  initgrcache \
> +  mem \
> +  netgroupcache \
> +  nscd \
> +  nscd_conf \
> +  nscd_setup_thread \
> +  nscd_stat \
> +  pwdcache \
> +  res_hconf \
> +  servicescache \
> +  xmalloc \
> +  xstrdup \
> +  # nscd-modules
>   
>   ifeq ($(build-nscd)$(have-thread-library),yesyes)
>   


-- 
Cheers,
Carlos.