From patchwork Mon Oct 2 12:55:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 76962 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8D2BD38207EE for ; Mon, 2 Oct 2023 13:03:04 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 4C3CB385F009 for ; Mon, 2 Oct 2023 13:02:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C3CB385F009 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=1696251734; 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=9fVj/GsfdqlkwaIKL37CYzGFdWSYGw0rSqH8+EQo57Y=; b=jIoiNIvvoyh0qgIO7qQeqrV/DAOifwJ4aISc0PKvCEtRNb3oLzJ4/0QzmIJxZe5b5zRsKl 6FjIWG+gqhRPD2a5cHXSokTx0Ll76j8pKDlLVpjeN+/jpciBcJRRzQJ9iPbcPRpewR5B9D RUGLdKcy6axXAVlb8gO9akpW4HQ/pJc= 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-353-XHgcVQuENA6Nd8hRR-qiBA-1; Mon, 02 Oct 2023 09:02:02 -0400 X-MC-Unique: XHgcVQuENA6Nd8hRR-qiBA-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 92DCD18153E8 for ; Mon, 2 Oct 2023 13:02:02 +0000 (UTC) Received: from localhost.localdomain (dhcp129-93.brq.redhat.com [10.34.129.93]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19621C15BB8; Mon, 2 Oct 2023 13:02:01 +0000 (UTC) From: Arjun Shankar To: libc-alpha@sourceware.org, Arjun Shankar Subject: [PATCH 01/16] inet: Rearrange and sort Makefile variables Date: Mon, 2 Oct 2023 14:55:13 +0200 Message-ID: <20231002130150.1497733-2-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 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_H4, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Rearrange lists of routines, tests, etc. into one-per-line in inet/Makefile and sort them using scripts/sort-makefile-lines.py. Reviewed-by: Siddhesh Poyarekar --- inet/Makefile | 142 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 112 insertions(+), 30 deletions(-) diff --git a/inet/Makefile b/inet/Makefile index f5249ab2b1..9db7f941c6 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -22,41 +22,123 @@ subdir := inet include ../Makeconfig -headers := netinet/ether.h netinet/in.h netinet/in_systm.h \ - netinet/if_ether.h netinet/igmp.h \ - netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \ - aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h \ - rpc/netdb.h - -routines := htonl htons \ - inet_lnaof inet_mkadr \ - inet_netof inet_ntoa inet_net herrno herrno-loc \ - gethstbyad gethstbyad_r gethstbynm gethstbynm2 gethstbynm2_r \ - gethstbynm_r gethstent gethstent_r \ - getnetbyad getnetbyad_r getnetbynm getnetent getnetent_r \ - getnetbynm_r \ - getproto getproto_r getprtent getprtent_r getprtname getprtname_r \ - getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \ - getservent_r getrpcent getrpcbyname getrpcbynumber \ - getrpcent_r getrpcbyname_r getrpcbynumber_r \ - ether_aton ether_aton_r ether_hton ether_line \ - ether_ntoa ether_ntoa_r ether_ntoh \ - rcmd rexec ruserpass bindresvport \ - getnetgrent_r getnetgrent \ - getaliasent_r getaliasent getaliasname getaliasname_r \ - in6_addr getnameinfo if_index ifaddrs inet6_option \ - getipv4sourcefilter setipv4sourcefilter \ - getsourcefilter setsourcefilter inet6_opt inet6_rth \ - inet6_scopeid_pton deadline idna idna_name_classify +headers := \ + $(wildcard arpa/*.h protocols/*.h) \ + aliases.h \ + bits/in.h \ + ifaddrs.h \ + netinet/ether.h \ + netinet/icmp6.h \ + netinet/if_ether.h \ + netinet/igmp.h \ + netinet/in.h \ + netinet/in_systm.h \ + netinet/ip.h \ + netinet/ip6.h \ + netinet/tcp.h \ + rpc/netdb.h \ + # headers + +routines := \ + bindresvport \ + deadline \ + ether_aton \ + ether_aton_r \ + ether_hton \ + ether_line \ + ether_ntoa \ + ether_ntoa_r \ + ether_ntoh \ + getaliasent \ + getaliasent_r \ + getaliasname \ + getaliasname_r \ + gethstbyad \ + gethstbyad_r \ + gethstbynm \ + gethstbynm2 \ + gethstbynm2_r \ + gethstbynm_r \ + gethstent \ + gethstent_r \ + getipv4sourcefilter \ + getnameinfo \ + getnetbyad \ + getnetbyad_r \ + getnetbynm \ + getnetbynm_r \ + getnetent \ + getnetent_r \ + getnetgrent \ + getnetgrent_r \ + getproto \ + getproto_r \ + getprtent \ + getprtent_r \ + getprtname \ + getprtname_r \ + getrpcbyname \ + getrpcbyname_r \ + getrpcbynumber \ + getrpcbynumber_r \ + getrpcent \ + getrpcent_r \ + getservent \ + getservent_r \ + getsourcefilter \ + getsrvbynm \ + getsrvbynm_r \ + getsrvbypt \ + getsrvbypt_r \ + herrno \ + herrno-loc \ + htonl \ + htons \ + idna \ + idna_name_classify \ + if_index \ + ifaddrs \ + in6_addr \ + inet6_opt \ + inet6_option \ + inet6_rth \ + inet6_scopeid_pton \ + inet_lnaof \ + inet_mkadr \ + inet_net \ + inet_netof \ + inet_ntoa \ + rcmd \ + rexec \ + ruserpass \ + setipv4sourcefilter \ + setsourcefilter \ + # routines install-others = $(inst_sysconfdir)/rpc aux := check_pf check_native ifreq -tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ - tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \ - tst-getni1 tst-getni2 tst-inet6_rth tst-checks tst-checks-posix \ - tst-sockaddr test-hnto-types tst-if_index-long +tests := \ + bug-if1 \ + htontest \ + test-hnto-types \ + test-ifaddrs \ + test-inet6_opt \ + test_ifindex \ + tst-checks \ + tst-checks-posix \ + tst-ether_aton \ + tst-ether_line \ + tst-gethnm \ + tst-getni1 \ + tst-getni2 \ + tst-if_index-long \ + tst-inet6_rth \ + tst-network \ + tst-ntoa \ + tst-sockaddr \ + # tests # tst-deadline must be linked statically so that we can access # internal functions.