From 5fe128338cf8780c1fe44e6434f158374c1e2193 Mon Sep 17 00:00:00 2001
From: Vito Caputo <vcaputo@pengaru.com>
Date: Mon, 23 Oct 2023 16:34:45 -0700
Subject: build: tidy up some Makefile.am files

Been ignoring this mess for too long, just whitespace changes -
nothing functionally different.

This makes diffs far easier to read when libs or modules get
added/removed etc.

Some of the other Makefile.am files could use similar tidying,
but these are the most commonly messed with in the course of
rototiller development.
---
 src/Makefile.am         | 87 +++++++++++++++++++++++++++++++++++++++++++++++--
 src/libs/Makefile.am    | 10 +++++-
 src/modules/Makefile.am | 33 ++++++++++++++++++-
 3 files changed, 125 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b6569ac..c6877a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,93 @@
 SUBDIRS = libs modules
 
 noinst_LTLIBRARIES = libtil.la
-libtil_la_SOURCES =  til.c til.h til_args.c til_args.h til_builtins.c til_fb.c til_fb.h til_jenkins.c til_jenkins.h til_limits.h til_module_context.c til_module_context.h til_settings.h til_settings.c til_setup.c til_setup.h til_str.c til_str.h til_stream.c til_stream.h til_tap.h til_threads.c til_threads.h til_util.c til_util.h
+libtil_la_SOURCES =						\
+			til.c					\
+			til.h					\
+			til_args.c				\
+			til_args.h				\
+			til_builtins.c				\
+			til_fb.c				\
+			til_fb.h				\
+			til_jenkins.c				\
+			til_jenkins.h				\
+			til_limits.h				\
+			til_module_context.c			\
+			til_module_context.h			\
+			til_settings.c				\
+			til_settings.h				\
+			til_setup.c				\
+			til_setup.h				\
+			til_str.c				\
+			til_str.h				\
+			til_stream.c				\
+			til_stream.h				\
+			til_tap.h				\
+			til_threads.c				\
+			til_threads.h				\
+			til_util.c				\
+			til_util.h
+
 libtil_la_CPPFLAGS = -I@top_srcdir@/src
-libtil_la_LIBADD = modules/asc/libasc.la modules/blinds/libblinds.la modules/checkers/libcheckers.la modules/compose/libcompose.la modules/drizzle/libdrizzle.la modules/flow/libflow.la modules/flui2d/libflui2d.la modules/julia/libjulia.la modules/meta2d/libmeta2d.la modules/mixer/libmixer.la modules/moire/libmoire.la modules/montage/libmontage.la modules/pixbounce/libpixbounce.la modules/plasma/libplasma.la modules/plato/libplato.la modules/ray/libray.la modules/rkt/librkt.la modules/roto/libroto.la modules/rtv/librtv.la modules/shapes/libshapes.la modules/signals/libsignals.la modules/snow/libsnow.la modules/sparkler/libsparkler.la modules/spiro/libspiro.la modules/stars/libstars.la modules/strobe/libstrobe.la modules/stub/libstub.la modules/submit/libsubmit.la modules/swab/libswab.la modules/swarm/libswarm.la modules/voronoi/libvoronoi.la libs/grid/libgrid.la libs/puddle/libpuddle.la libs/ray/libray.la libs/rocket/librocket.la libs/sig/libsig.la libs/txt/libtxt.la libs/ascii/libascii.la libs/din/libdin.la
+libtil_la_LIBADD =						\
+			modules/asc/libasc.la			\
+			modules/blinds/libblinds.la		\
+			modules/checkers/libcheckers.la		\
+			modules/compose/libcompose.la		\
+			modules/drizzle/libdrizzle.la		\
+			modules/flow/libflow.la			\
+			modules/flui2d/libflui2d.la		\
+			modules/julia/libjulia.la		\
+			modules/meta2d/libmeta2d.la		\
+			modules/mixer/libmixer.la		\
+			modules/moire/libmoire.la		\
+			modules/montage/libmontage.la		\
+			modules/pixbounce/libpixbounce.la	\
+			modules/plasma/libplasma.la		\
+			modules/plato/libplato.la		\
+			modules/ray/libray.la			\
+			modules/rkt/librkt.la			\
+			modules/roto/libroto.la			\
+			modules/rtv/librtv.la			\
+			modules/shapes/libshapes.la		\
+			modules/signals/libsignals.la		\
+			modules/snow/libsnow.la			\
+			modules/sparkler/libsparkler.la		\
+			modules/spiro/libspiro.la		\
+			modules/stars/libstars.la		\
+			modules/strobe/libstrobe.la		\
+			modules/stub/libstub.la			\
+			modules/submit/libsubmit.la		\
+			modules/swab/libswab.la			\
+			modules/swarm/libswarm.la		\
+			modules/voronoi/libvoronoi.la		\
+			libs/grid/libgrid.la			\
+			libs/puddle/libpuddle.la		\
+			libs/ray/libray.la			\
+			libs/rocket/librocket.la		\
+			libs/sig/libsig.la			\
+			libs/txt/libtxt.la			\
+			libs/ascii/libascii.la			\
+			libs/din/libdin.la
 
 bin_PROGRAMS = rototiller
-rototiller_SOURCES = fps.c fps.h main.c mem_fb.c setup.h setup.c til.h til_fb.c til_fb.h til_settings.c til_settings.h til_threads.c til_threads.h til_util.c til_util.h
+rototiller_SOURCES =						\
+			fps.c					\
+			fps.h					\
+			main.c					\
+			mem_fb.c				\
+			setup.c					\
+			setup.h					\
+			til.h					\
+			til_fb.c				\
+			til_fb.h				\
+			til_settings.c				\
+			til_settings.h				\
+			til_threads.c				\
+			til_threads.h				\
+			til_util.c				\
+			til_util.h
+
 if ENABLE_SDL
 rototiller_SOURCES += sdl_fb.c
 endif
diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am
index 39de08d..57b81d4 100644
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -1 +1,9 @@
-SUBDIRS = ascii grid din rocket puddle ray sig txt
+SUBDIRS =		\
+		ascii	\
+		grid	\
+		din	\
+		rocket	\
+		puddle	\
+		ray	\
+		sig	\
+		txt
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index aa63268..52d6180 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -1 +1,32 @@
-SUBDIRS = asc blinds checkers compose drizzle flow flui2d julia meta2d mixer moire montage pixbounce plasma plato ray rkt roto rtv shapes signals snow sparkler spiro stars strobe stub submit swab swarm voronoi
+SUBDIRS =			\
+		asc		\
+		blinds		\
+		checkers	\
+		compose		\
+		drizzle		\
+		flow		\
+		flui2d		\
+		julia		\
+		meta2d		\
+		mixer		\
+		moire		\
+		montage		\
+		pixbounce	\
+		plasma		\
+		plato		\
+		ray		\
+		rkt		\
+		roto		\
+		rtv		\
+		shapes		\
+		signals		\
+		snow		\
+		sparkler	\
+		spiro		\
+		stars		\
+		strobe		\
+		stub		\
+		submit		\
+		swab		\
+		swarm		\
+		voronoi
-- 
cgit v1.2.1