Split long lines in configure.in and Makefile.am files

Having very long single lines with lots and lots of things in them
tends to make files hard to diff and hard to merge.  Since our tools
are one-line-at-a-time, we should try to construct lists that way too,
within reason.

This incidentally turned up a few headers in configure.in that we were
for some reason searching for twice.

src/common/Makefile.am

@@ -11,12 +11,44 @@ else
 libor_extra_source=
 endif
 
-libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \
-	memarea.c util_codedigest.c $(libor_extra_source)
-libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c
+libor_a_SOURCES = \
+  address.c					\
+  compat.c					\
+  container.c					\
+  log.c						\
+  memarea.c					\
+  mempool.c					\
+  util.c					\
+  util_codedigest.c				\
+  $(libor_extra_source)
+
+libor_crypto_a_SOURCES = \
+  aes.c		\
+  crypto.c	\
+  torgzip.c	\
+  tortls.c
+
 libor_event_a_SOURCES = compat_libevent.c
 
-noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h
+noinst_HEADERS = 				\
+  address.h					\
+  aes.h						\
+  ciphers.inc					\
+  compat.h					\
+  compat_libevent.h				\
+  container.h					\
+  crypto.h					\
+  ht.h						\
+  memarea.h					\
+  mempool.h					\
+  strlcat.c					\
+  strlcpy.c					\
+  torgzip.h					\
+  torint.h					\
+  torlog.h					\
+  tortls.h					\
+  tortls_states.h				\
+  util.h
 
 common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
 	if test "@SHA1SUM@" != none; then \

src/or/Makefile.am

@@ -15,16 +15,44 @@ else
 evdns_source=eventdns.c
 endif
 
-libtor_a_SOURCES = buffers.c circuitbuild.c circuitlist.c \
-	circuituse.c command.c config.c \
-	connection.c connection_edge.c connection_or.c control.c \
-	cpuworker.c directory.c dirserv.c dirvote.c \
-	dns.c dnsserv.c geoip.c hibernate.c main.c $(tor_platform_source) \
-	microdesc.c \
-	networkstatus.c nodelist.c onion.c policies.c \
-	reasons.c relay.c rendcommon.c rendclient.c rendmid.c \
-	rendservice.c rephist.c router.c routerlist.c routerparse.c \
-	$(evdns_source) config_codedigest.c
+libtor_a_SOURCES = \
+	buffers.c				\
+	circuitbuild.c				\
+	circuitlist.c				\
+	circuituse.c				\
+	command.c				\
+	config.c				\
+	connection.c				\
+	connection_edge.c			\
+	connection_or.c				\
+	control.c				\
+	cpuworker.c				\
+	directory.c				\
+	dirserv.c				\
+	dirvote.c				\
+	dns.c					\
+	dnsserv.c				\
+	geoip.c					\
+	hibernate.c				\
+	main.c					\
+	microdesc.c				\
+	networkstatus.c				\
+	nodelist.c				\
+	onion.c					\
+	policies.c				\
+	reasons.c				\
+	relay.c					\
+	rendclient.c				\
+	rendcommon.c				\
+	rendmid.c				\
+	rendservice.c				\
+	rephist.c				\
+	router.c				\
+	routerlist.c				\
+	routerparse.c				\
+	$(evdns_source)				\
+	$(tor_platform_source)			\
+	config_codedigest.c
 
 #libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \
 #	../common/libor-event.a
@@ -52,14 +80,46 @@ tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \
 	@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib)
 
-noinst_HEADERS = buffers.h circuitbuild.h circuitlist.h circuituse.h \
-	command.h config.h connection_edge.h connection.h connection_or.h \
-	control.h cpuworker.h directory.h dirserv.h dirvote.h dns.h \
-	dnsserv.h geoip.h hibernate.h main.h microdesc.h networkstatus.h \
-	nodelist.h \
-	ntmain.h onion.h policies.h reasons.h relay.h rendclient.h \
-	rendcommon.h rendmid.h rendservice.h rephist.h router.h routerlist.h \
-	routerparse.h or.h eventdns.h eventdns_tor.h micro-revision.i
+noinst_HEADERS = \
+	buffers.h				\
+	circuitbuild.h				\
+	circuitlist.h				\
+	circuituse.h				\
+	command.h				\
+	config.h				\
+	connection.h				\
+	connection_edge.h			\
+	connection_or.h				\
+	control.h				\
+	cpuworker.h				\
+	directory.h				\
+	dirserv.h				\
+	dirvote.h				\
+	dns.h					\
+	dnsserv.h				\
+	eventdns.h				\
+	eventdns_tor.h				\
+	geoip.h					\
+	hibernate.h				\
+	main.h					\
+	microdesc.h				\
+	networkstatus.h				\
+	nodelist.h				\
+	ntmain.h				\
+	onion.h					\
+	or.h					\
+	policies.h				\
+	reasons.h				\
+	relay.h					\
+	rendclient.h				\
+	rendcommon.h				\
+	rendmid.h				\
+	rendservice.h				\
+	rephist.h				\
+	router.h				\
+	routerlist.h				\
+	routerparse.h				\
+	micro-revision.i
 
 config_codedigest.o: or_sha1.i
 

src/test/Makefile.am

@@ -12,14 +12,14 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
 # matters a lot there, and is quite hard to debug if you forget to do it.
 
 test_SOURCES = \
-	test_data.c \
 	test.c \
 	test_addr.c \
-	test_crypto.c \
-	test_dir.c \
 	test_containers.c \
-	test_util.c \
+	test_crypto.c \
+	test_data.c \
+	test_dir.c \
 	test_microdesc.c \
+	test_util.c \
 	tinytest.c
 
 if USE_BUFFEREVENTS
@@ -35,6 +35,9 @@ test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \
 	@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib)
 
-noinst_HEADERS = tinytest.h tinytest_macros.h test.h
+noinst_HEADERS = \
+	tinytest.h \
+	tinytest_macros.h \
+	test.h
 
 

src/tools/tor-fw-helper/Makefile.am

@@ -4,9 +4,14 @@ else
 bin_PROGRAMS =
 endif
 
-tor_fw_helper_SOURCES = tor-fw-helper.c \
-	tor-fw-helper-natpmp.c tor-fw-helper-upnp.c
-tor_fw_helper_INCLUDES = tor-fw-helper.h tor-fw-helper-natpmp.h tor-fw-helper-upnp.h
+tor_fw_helper_SOURCES = \
+	tor-fw-helper.c \
+	tor-fw-helper-natpmp.c \
+	tor-fw-helper-upnp.c
+tor_fw_helper_INCLUDES = \
+	tor-fw-helper.h \
+	tor-fw-helper-natpmp.h \
+	tor-fw-helper-upnp.h
 
 if NAT_PMP
 nat_pmp_ldflags = @TOR_LDFLAGS_libnatpmp@