inet: Rearrange and sort Makefile variables

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 <siddhesh@sourceware.org>

inet/Makefile

@@ -22,41 +22,123 @@ subdir	:= inet
 
 include ../Makeconfig
 
-headers	:= netinet/ether.h netinet/in.h netinet/in_systm.h \
+headers := \
-	   netinet/if_ether.h netinet/igmp.h \
+  $(wildcard arpa/*.h protocols/*.h) \
-	   netinet/tcp.h netinet/ip.h $(wildcard arpa/*.h protocols/*.h) \
+  aliases.h \
-	   aliases.h ifaddrs.h netinet/ip6.h netinet/icmp6.h bits/in.h \
+  bits/in.h \
-	   rpc/netdb.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 := htonl htons		\
+routines := \
-	    inet_lnaof inet_mkadr	\
+  bindresvport \
-	    inet_netof inet_ntoa inet_net herrno herrno-loc \
+  deadline \
-	    gethstbyad gethstbyad_r gethstbynm gethstbynm2 gethstbynm2_r \
+  ether_aton \
-	    gethstbynm_r gethstent gethstent_r \
+  ether_aton_r \
-	    getnetbyad getnetbyad_r getnetbynm getnetent getnetent_r \
+  ether_hton \
-	    getnetbynm_r \
+  ether_line \
-	    getproto getproto_r getprtent getprtent_r getprtname getprtname_r \
+  ether_ntoa \
-	    getsrvbynm getsrvbynm_r getsrvbypt getsrvbypt_r getservent \
+  ether_ntoa_r \
-	    getservent_r getrpcent getrpcbyname getrpcbynumber \
+  ether_ntoh \
-	    getrpcent_r getrpcbyname_r getrpcbynumber_r \
+  getaliasent \
-	    ether_aton ether_aton_r ether_hton ether_line \
+  getaliasent_r \
-	    ether_ntoa ether_ntoa_r ether_ntoh \
+  getaliasname \
-	    rcmd rexec ruserpass bindresvport \
+  getaliasname_r \
-	    getnetgrent_r getnetgrent \
+  gethstbyad \
-	    getaliasent_r getaliasent getaliasname getaliasname_r \
+  gethstbyad_r \
-	    in6_addr getnameinfo if_index ifaddrs inet6_option \
+  gethstbynm \
-	    getipv4sourcefilter setipv4sourcefilter \
+  gethstbynm2 \
-	    getsourcefilter setsourcefilter inet6_opt inet6_rth \
+  gethstbynm2_r \
-	    inet6_scopeid_pton deadline idna idna_name_classify
+  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 \
+tests := \
-	 tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \
+  bug-if1 \
-	 tst-getni1 tst-getni2 tst-inet6_rth tst-checks tst-checks-posix \
+  htontest \
-	 tst-sockaddr test-hnto-types tst-if_index-long
+  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.