Cleanup: Automake: remove single use variables

Throughout the Automake files, there is a consistent pattern somewhat
like this:

    FOO_BINS = ....

    sbin_PROGRAMS += $(FOO_BINS)

This commit all such patterns whenever the variable is not used anywhere
else and appends to the target directly.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

diff --git a/Makefile.am b/Makefile.am
index 8a169fb6c3390000d5a8bf9330bab19c013565d8..ce8fc8908980faa4f72b69a879a85b784f5c725e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,12 +38,7 @@ dist_man1_MANS =
 dist_man8_MANS =
 
 TESTS =
-EXTRA_DIST =
-
-GLOBAL_EXTRA = \
-       COPYING
-
-EXTRA_DIST += $(GLOBAL_EXTRA)
+EXTRA_DIST = COPYING
 
 include lib/Makemodule.am
 include ubi-utils/Makemodule.am

diff --git a/jffsX-utils/Makemodule.am b/jffsX-utils/Makemodule.am
index 64a969de1a29101a802593e0e0793be56095ae2f..96389f68993463906f081fec3cf9a85de1e8e29d 100644 (file)
--- a/jffsX-utils/Makemodule.am
+++ b/jffsX-utils/Makemodule.am
@@ -27,16 +27,7 @@ jffs2dump_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS)
 sumtool_SOURCES = jffsX-utils/sumtool.c jffsX-utils/summary.h
 sumtool_LDADD = libmtd.a
 
-JFFSX_BINS = \
-       mkfs.jffs2 jffs2dump jffs2reader sumtool
+EXTRA_DIST += jffsX-utils/device_table.txt jffsX-utils/mkfs.jffs2.1
 
-JFFSX_MAN = \
-       jffsX-utils/mkfs.jffs2.1
-
-JFFSX_EXTRA = \
-       jffsX-utils/device_table.txt jffsX-utils/mkfs.jffs2.1
-
-EXTRA_DIST += $(JFFSX_EXTRA)
-
-dist_man1_MANS += $(JFFSX_MAN)
-sbin_PROGRAMS += $(JFFSX_BINS)
+dist_man1_MANS += jffsX-utils/mkfs.jffs2.1
+sbin_PROGRAMS += mkfs.jffs2 jffs2dump jffs2reader sumtool

diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
index 50703b66bec57e45dc1344315be7785009600187..b15c1194afffe6ae199795e4843a615864e19a38 100644 (file)
--- a/misc-utils/Makemodule.am
+++ b/misc-utils/Makemodule.am
@@ -39,7 +39,7 @@ flashcp_SOURCES = misc-utils/flashcp.c
 flash_erase_SOURCES = misc-utils/flash_erase.c
 flash_erase_LDADD = libmtd.a
 
-MISC_BINS = \
+sbin_PROGRAMS += \
        ftl_format doc_loadbios ftl_check mtd_debug docfdisk \
        serve_image recv_image fectest flash_erase flash_lock \
        flash_unlock flash_otp_info flash_otp_dump flash_otp_lock \
@@ -48,22 +48,15 @@ MISC_BINS = \
 MISC_SH = \
        misc-utils/flash_eraseall
 
-MISC_EXTRA = \
-       misc-utils/MAKEDEV
-
-MISC_MAN =
-
 if BUILD_LSMTD
 lsmtd_SOURCES = misc-utils/lsmtd.c misc-utils/lsmtd_scan.c misc-utils/lsmtd.h
 lsmtd_LDADD = libmtd.a libubi.a
 lsmtd_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/misc-utils
 
-MISC_BINS += lsmtd
-MISC_MAN += misc-utils/lsmtd.8
+sbin_PROGRAMS += lsmtd
+dist_man8_MANS += misc-utils/lsmtd.8
 endif
 
-EXTRA_DIST += $(MISC_EXTRA) $(MISC_SH)
+EXTRA_DIST += misc-utils/MAKEDEV $(MISC_SH)
 
-dist_man8_MANS += $(MISC_MAN)
-sbin_PROGRAMS += $(MISC_BINS)
 sbin_SCRIPTS += $(MISC_SH)

diff --git a/nand-utils/Makemodule.am b/nand-utils/Makemodule.am
index 439b37d64d3069c7b8b8b254e47a070fa12c5b15..1cb69dcaa4f7f932bea9f317be410639f97dd934 100644 (file)
--- a/nand-utils/Makemodule.am
+++ b/nand-utils/Makemodule.am
@@ -18,15 +18,12 @@ nftl_format_LDADD = libmtd.a
 nandflipbits_SOURCES = nand-utils/nandflipbits.c
 nandflipbits_LDADD = libmtd.a
 
-NAND_BINS = \
-       nanddump nandwrite nandtest nftldump nftl_format nandflipbits
-
 NAND_SH = \
        nand-utils/load_nandsim.sh
 
 EXTRA_DIST += $(NAND_SH)
 
-sbin_PROGRAMS += $(NAND_BINS)
+sbin_PROGRAMS += nanddump nandwrite nandtest nftldump nftl_format nandflipbits
 
 if BUILD_TESTS
 if INSTALL_TESTS

diff --git a/nor-utils/Makemodule.am b/nor-utils/Makemodule.am
index ef46cf86a38048907bde500d46bf9ec77fb80608..441a72e5d6a844a2e5d2bb8a3dbaa0bab27c7c8d 100644 (file)
--- a/nor-utils/Makemodule.am
+++ b/nor-utils/Makemodule.am
@@ -4,7 +4,4 @@ rfddump_LDADD = libmtd.a
 rfdformat_SOURCES = nor-utils/rfdformat.c
 rfdformat_LDADD = libmtd.a
 
-NOR_BINS = \
-       rfddump rfdformat
-
-sbin_PROGRAMS += $(NOR_BINS)
+sbin_PROGRAMS += rfddump rfdformat

diff --git a/tests/checkfs/Makemodule.am b/tests/checkfs/Makemodule.am
index 64ab869f387f4f3e3e3861cca08fb0eade6f3447..9f913731626ed072620207fb532015d2269fb04b 100644 (file)
--- a/tests/checkfs/Makemodule.am
+++ b/tests/checkfs/Makemodule.am
@@ -8,10 +8,7 @@ makefiles_CPPFLAGS = $(AM_CPPFLAGS)
 CHECKFS_BINS = \
        makefiles checkfs
 
-CHECKFS_EXTRA = \
-       tests/checkfs/README
-
-EXTRA_DIST += $(CHECKFS_EXTRA)
+EXTRA_DIST += tests/checkfs/README
 
 if INSTALL_TESTS
 pkglibexec_PROGRAMS += $(CHECKFS_BINS)

diff --git a/tests/jittertest/Makemodule.am b/tests/jittertest/Makemodule.am
index d4cc12137d1ab0a7fe1fd79ea5aee462d71b2027..4698365cceead466ad0f7ccde6336d8a896a81ab 100644 (file)
--- a/tests/jittertest/Makemodule.am
+++ b/tests/jittertest/Makemodule.am
@@ -10,10 +10,7 @@ JITTEREST_BINS = \
 JITTERTEST_SH = \
        tests/jittertest/filljffs2.sh
 
-JITTERTEST_EXTRA = \
-       tests/jittertest/README
-
-EXTRA_DIST += $(JITTERTEST_EXTRA) $(JITTERTEST_SH)
+EXTRA_DIST += tests/jittertest/README $(JITTERTEST_SH)
 
 if INSTALL_TESTS
 pkglibexec_SCRIPTS += $(JITTERTEST_SH)

diff --git a/tests/unittests/Makemodule.am b/tests/unittests/Makemodule.am
index cadd1bc0bf2f0e11a72391a97891cfde9f700098..277cac2f7e996fa59e243a1d588af70a7e9fd6c3 100644 (file)
--- a/tests/unittests/Makemodule.am
+++ b/tests/unittests/Makemodule.am
@@ -14,10 +14,7 @@ TEST_BINS = \
        ubilib_test \
        mtdlib_test
 
-UNITTEST_EXTRA = \
-       tests/unittests/sysfs_mock
-
-EXTRA_DIST += $(UNITTEST_EXTRA)
+EXTRA_DIST += tests/unittests/sysfs_mock
 
 TESTS += $(TEST_BINS)
 check_PROGRAMS += $(TEST_BINS)

diff --git a/ubi-utils/Makemodule.am b/ubi-utils/Makemodule.am
index 00d5d8f598052e52551f3a3fa7d6b78e568b8359..7491a8a98b0d0e6a159512865ea806bede6154cd 100644 (file)
--- a/ubi-utils/Makemodule.am
+++ b/ubi-utils/Makemodule.am
@@ -42,17 +42,13 @@ ubihealthd_SOURCES = ubi-utils/ubihealthd.c
 ubihealthd_LDADD = libmtd.a libubi.a
 endif
 
-UBI_BINS = \
+sbin_PROGRAMS += \
        ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \
        ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol ubiblock
 
 if WITH_GETRANDOM
-UBI_BINS += ubihealthd
+sbin_PROGRAMS += ubihealthd
 endif
 
-UBI_MAN = \
-       ubi-utils/ubinize.8
+dist_man8_MANS += ubi-utils/ubinize.8
 
-dist_man8_MANS += $(UBI_MAN)
-
-sbin_PROGRAMS += $(UBI_BINS)

diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am
index feedb7c9fe807532f2687134aff1b2ee765db238..6814d47b1f0861be4c0753efdea42bd855e97b43 100644 (file)
--- a/ubifs-utils/Makemodule.am
+++ b/ubifs-utils/Makemodule.am
@@ -31,14 +31,8 @@ mkfs_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUI
 mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS)\
        -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/mkfs.ubifs/
 
-UBIFS_BINS = \
-       mkfs.ubifs
-
-UBIFS_EXTRA = \
-       ubifs-utils/mkfs.ubifs/README
-
-EXTRA_DIST += $(UBIFS_EXTRA)
+EXTRA_DIST += ubifs-utils/mkfs.ubifs/README
 
 dist_sbin_SCRIPTS = ubifs-utils/mount.ubifs
 
-sbin_PROGRAMS += $(UBIFS_BINS)
+sbin_PROGRAMS += mkfs.ubifs