From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2012) id 011AD3857706; Wed, 4 Oct 2023 10:46:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 011AD3857706 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1696416416; bh=zEoTucu6fR7KNblo2cKrGE84A5p3ge/iDtzkNmE4nvs=; h=From:To:Subject:Date:From; b=qslfInN+cwQB9e7U+XhoORptdGA+mT7ox/ck7Bpdg3OchqixN5rWuo/wTk7MuCGMf OMpPR6dyS3eT2BFC8Ns+yOlyGHQIWrgYXKE/0cBewYBriVI4ZwcG+tlF1vDit/0lav DL0yl38D1YWFz4EegFT+ULmLorWoncF27+LD0W2o= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Arjun Shankar To: glibc-cvs@sourceware.org Subject: [glibc] nss: Rearrange and sort Makefile variables X-Act-Checkin: glibc X-Git-Author: Arjun Shankar X-Git-Refname: refs/heads/master X-Git-Oldrev: b6b8a88cf59a00d7716e9dd2e5ba92eedfec69ce X-Git-Newrev: 751850cf5a87e463f0f8b508672594e54853495c Message-Id: <20231004104656.011AD3857706@sourceware.org> Date: Wed, 4 Oct 2023 10:46:56 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=751850cf5a87e463f0f8b508672594e54853495c commit 751850cf5a87e463f0f8b508672594e54853495c Author: Arjun Shankar Date: Mon Oct 2 14:55:14 2023 +0200 nss: Rearrange and sort Makefile variables Rearrange lists of routines, tests, etc. into one-per-line in nss/Makefile and sort them using scripts/sort-makefile-lines.py. Reviewed-by: Siddhesh Poyarekar Diff: --- nss/Makefile | 55 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/nss/Makefile b/nss/Makefile index 668ba34b18..32764b74c0 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -22,23 +22,50 @@ subdir := nss include ../Makeconfig -headers := nss.h +headers := \ + nss.h \ + # headers # This is the trivial part which goes into libc itself. -routines = nsswitch getnssent getnssent_r digits_dots \ - valid_field valid_list_field rewrite_field \ - $(addsuffix -lookup,$(databases)) \ - compat-lookup nss_hash nss_files_fopen \ - nss_readline nss_parse_line_result \ - nss_fgetent_r nss_module nss_action \ - nss_action_parse nss_database nss_files_data \ - nss_files_functions +routines = \ + $(addsuffix -lookup,$(databases)) \ + compat-lookup \ + digits_dots \ + getnssent \ + getnssent_r \ + nss_action \ + nss_action_parse \ + nss_database \ + nss_fgetent_r \ + nss_files_data \ + nss_files_fopen \ + nss_files_functions \ + nss_hash \ + nss_module \ + nss_parse_line_result \ + nss_readline \ + nsswitch \ + rewrite_field \ + valid_field \ + valid_list_field \ + # routines # These are the databases that go through nss dispatch. # Caution: if you add a database here, you must add its real name # in databases.def, too. -databases = proto service hosts network grp pwd ethers \ - spwd netgrp alias sgrp +databases = \ + alias \ + ethers \ + grp \ + hosts \ + netgrp \ + network \ + proto \ + pwd \ + service \ + sgrp \ + spwd \ + # databases ifneq (,$(filter sunrpc,$(subdirs))) databases += key rpc @@ -68,7 +95,7 @@ tests := \ tst-nss-test4 \ tst-nss-test5 \ tst-nss-test_errno \ -# tests + # tests xtests = bug-erange @@ -79,11 +106,11 @@ tests-container := \ tst-nss-files-hosts-long \ tst-nss-files-hosts-v4mapped \ tst-nss-gai-actions \ + tst-nss-gai-hv2-canonname \ tst-nss-test3 \ tst-reload1 \ tst-reload2 \ - tst-nss-gai-hv2-canonname \ -# tests-container + # tests-container # Tests which need libdl ifeq (yes,$(build-shared))