build: unify the coding style of source files lists in Makefiles

Use the most common and readable convention for listing source files
in Makefiles wherever it's not consistent yet.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am
index f719072bb30e0c908ad80b59232d05d550a39edd..f2fc884880a5210bc3a8b5c976f17db0083ed529 100644 (file)
--- a/bindings/cxx/Makefile.am
+++ b/bindings/cxx/Makefile.am
@@ -2,22 +2,22 @@
 # SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com>
 
 lib_LTLIBRARIES = libgpiodcxx.la
-libgpiodcxx_la_SOURCES =       \
-       chip.cpp                \
-       chip-info.cpp           \
-       edge-event-buffer.cpp   \
-       edge-event.cpp          \
-       exception.cpp           \
-       info-event.cpp          \
-       internal.cpp            \
-       internal.hpp            \
-       line.cpp                \
-       line-config.cpp         \
-       line-info.cpp           \
-       line-request.cpp        \
-       line-settings.cpp       \
-       misc.cpp                \
-       request-builder.cpp     \
+libgpiodcxx_la_SOURCES = \
+       chip.cpp \
+       chip-info.cpp \
+       edge-event-buffer.cpp \
+       edge-event.cpp \
+       exception.cpp \
+       info-event.cpp \
+       internal.cpp \
+       internal.hpp \
+       line.cpp \
+       line-config.cpp \
+       line-info.cpp \
+       line-request.cpp \
+       line-settings.cpp \
+       misc.cpp \
+       request-builder.cpp \
        request-config.cpp
 
 libgpiodcxx_la_CXXFLAGS = -Wall -Wextra -g -std=gnu++17

diff --git a/bindings/cxx/examples/Makefile.am b/bindings/cxx/examples/Makefile.am
index c7ec3cfa8349d00a54eb5fb741f0bd2e8d76403d..e4136f533c4d26ebd1227909e800ba3b1efb48ca 100644 (file)
--- a/bindings/cxx/examples/Makefile.am
+++ b/bindings/cxx/examples/Makefile.am
@@ -6,12 +6,12 @@ AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17
 AM_LDFLAGS = -lgpiodcxx -L$(top_builddir)/bindings/cxx/
 
 noinst_PROGRAMS = \
-               gpiodetectcxx \
-               gpiofindcxx \
-               gpiogetcxx \
-               gpioinfocxx \
-               gpiomoncxx \
-               gpiosetcxx
+       gpiodetectcxx \
+       gpiofindcxx \
+       gpiogetcxx \
+       gpioinfocxx \
+       gpiomoncxx \
+       gpiosetcxx
 
 gpiodetectcxx_SOURCES = gpiodetectcxx.cpp
 

diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am
index 4971dd469290271397c80b5407704ba941e2df8b..924a3cd04ecf454220ea7841038f93cdc9a6e3d6 100644 (file)
--- a/bindings/cxx/tests/Makefile.am
+++ b/bindings/cxx/tests/Makefile.am
@@ -12,21 +12,21 @@ AM_LDFLAGS += -pthread
 
 bin_PROGRAMS = gpiod-cxx-test
 
-gpiod_cxx_test_SOURCES =                       \
-               check-kernel.cpp                \
-               gpiod-cxx-test-main.cpp         \
-               gpiosim.cpp                     \
-               gpiosim.hpp                     \
-               helpers.cpp                     \
-               helpers.hpp                     \
-               tests-chip.cpp                  \
-               tests-chip-info.cpp             \
-               tests-edge-event.cpp            \
-               tests-info-event.cpp            \
-               tests-line.cpp                  \
-               tests-line-config.cpp           \
-               tests-line-info.cpp             \
-               tests-line-request.cpp          \
-               tests-line-settings.cpp         \
-               tests-misc.cpp                  \
-               tests-request-config.cpp
\ No newline at end of file
+gpiod_cxx_test_SOURCES = \
+       check-kernel.cpp \
+       gpiod-cxx-test-main.cpp \
+       gpiosim.cpp \
+       gpiosim.hpp \
+       helpers.cpp \
+       helpers.hpp \
+       tests-chip.cpp \
+       tests-chip-info.cpp \
+       tests-edge-event.cpp \
+       tests-info-event.cpp \
+       tests-line.cpp \
+       tests-line-config.cpp \
+       tests-line-info.cpp \
+       tests-line-request.cpp \
+       tests-line-settings.cpp \
+       tests-misc.cpp \
+       tests-request-config.cpp

diff --git a/lib/Makefile.am b/lib/Makefile.am
index dd90abd130b10367461fee9830ae4b78d7f0d480..3e7114b1c7e951e82d044deeb24a271005388b79 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,19 +2,20 @@
 # SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com>
 
 lib_LTLIBRARIES = libgpiod.la
-libgpiod_la_SOURCES =  chip.c \
-                       chip-info.c \
-                       edge-event.c \
-                       info-event.c \
-                       internal.h \
-                       internal.c \
-                       line-config.c \
-                       line-info.c \
-                       line-request.c \
-                       line-settings.c \
-                       misc.c \
-                       request-config.c \
-                       uapi/gpio.h
+libgpiod_la_SOURCES = \
+       chip.c \
+       chip-info.c \
+       edge-event.c \
+       info-event.c \
+       internal.h \
+       internal.c \
+       line-config.c \
+       line-info.c \
+       line-request.c \
+       line-settings.c \
+       misc.c \
+       request-config.c \
+       uapi/gpio.h
 
 libgpiod_la_CFLAGS = -Wall -Wextra -g -std=gnu89
 libgpiod_la_CFLAGS += -fvisibility=hidden -I$(top_srcdir)/include/

diff --git a/man/Makefile.am b/man/Makefile.am
index 201a52b5bfd8a14bdaf8a35b6219fd196126fd42..1b52e0fd9e1919b4306c88f2fa802aba2c77345b 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -3,7 +3,13 @@
 
 if WITH_MANPAGES
 
-dist_man1_MANS = gpiodetect.man gpioinfo.man gpioget.man gpioset.man gpiomon.man gpionotify.man
+dist_man1_MANS = \
+       gpiodetect.man \
+       gpioinfo.man \
+       gpioget.man \
+       gpioset.man \
+       gpiomon.man \
+       gpionotify.man
 
 %.man: $(top_builddir)/tools/$(*F)
        help2man $(top_builddir)/tools/$(*F) --include=$(srcdir)/template --output=$(builddir)/$@ --no-info

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4dd52971cf9de4a161b968f9c5ebff3afd19732b..0fdbe5b8bbc0b4139cade345d6a72650533b8222 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,20 +14,20 @@ LDADD += $(GLIB_LIBS) $(GOBJECT_LIBS)
 
 bin_PROGRAMS = gpiod-test
 
-gpiod_test_SOURCES =                   \
-               gpiod-test.c            \
-               gpiod-test.h            \
-               gpiod-test-helpers.c    \
-               gpiod-test-helpers.h    \
-               gpiod-test-sim.c        \
-               gpiod-test-sim.h        \
-               tests-chip.c            \
-               tests-chip-info.c       \
-               tests-edge-event.c      \
-               tests-info-event.c      \
-               tests-line-config.c     \
-               tests-line-info.c       \
-               tests-line-request.c    \
-               tests-line-settings.c   \
-               tests-misc.c            \
-               tests-request-config.c
+gpiod_test_SOURCES = \
+       gpiod-test.c \
+       gpiod-test.h \
+       gpiod-test-helpers.c \
+       gpiod-test-helpers.h \
+       gpiod-test-sim.c \
+       gpiod-test-sim.h \
+       tests-chip.c \
+       tests-chip-info.c \
+       tests-edge-event.c \
+       tests-info-event.c \
+       tests-line-config.c \
+       tests-line-info.c \
+       tests-line-request.c \
+       tests-line-settings.c \
+       tests-misc.c \
+       tests-request-config.c