From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D911E385CCA1 for ; Mon, 2 Oct 2023 13:02:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D911E385CCA1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696251735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b9T2biJc7UG3PNG2BvztmZdyEo/To5ReDQFAWV4R350=; b=SlEQJohaLS8wTtUdm6ZuRZKXAvF3xw+Ot58g6l6nrMIZnniAcQkKgoxDNZAxzltyOE7heF 8jwYDD9wN8neuzS5rSO2FIWass6hMwP6fd7hfuLIEaqta8ZafRF/V6nfipa1RdpTWjuNmA k2lrvnN0celulkLeZVQ7H4wwPpfyTPA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-618-n9GKOUfhOo-gZJodOdBx4Q-1; Mon, 02 Oct 2023 09:02:04 -0400 X-MC-Unique: n9GKOUfhOo-gZJodOdBx4Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E51CE18153E6 for ; Mon, 2 Oct 2023 13:02:03 +0000 (UTC) Received: from localhost.localdomain (dhcp129-93.brq.redhat.com [10.34.129.93]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CB2CC15BB8; Mon, 2 Oct 2023 13:02:03 +0000 (UTC) From: Arjun Shankar To: libc-alpha@sourceware.org, Arjun Shankar Subject: [PATCH 02/16] nss: Rearrange and sort Makefile variables Date: Mon, 2 Oct 2023 14:55:14 +0200 Message-ID: <20231002130150.1497733-3-arjun@redhat.com> In-Reply-To: <20231002130150.1497733-1-arjun@redhat.com> References: <20231002130150.1497733-1-arjun@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Rearrange lists of routines, tests, etc. into one-per-line in nss/Makefile and sort them using scripts/sort-makefile-lines.py. --- 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)) -- 2.41.0