From a888044525d9f03290cc1afe62dcfa3bec4bc0b9 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 19 Oct 2020 11:40:56 +0200 Subject: 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 --- misc-utils/Makemodule.am | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'misc-utils') diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 50703b6..b15c119 100644 --- 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) -- cgit v1.2.3