From edb5d2a320adf99ddbb12fbc8a03a5fe7cf7741f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 31 Aug 2020 13:27:57 +0200 Subject: [PATCH] tools: sort alphabetically This sorts the added tools and builddir dependencies alphabetically to make it easier to find something in the Makefile. Signed-off-by: Adrian Schmutzler --- tools/Makefile | 75 +++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 3bd01ebaa73..65bec34c1bd 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -21,59 +21,58 @@ ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar BUILD_B43_TOOLS = y endif -tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf expat -tools-y += m4 libtool autoconf autoconf-archive automake flex bison pkgconf mklibs zlib -tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage -tools-y += firmware-utils patch-image quilt padjffs2 -tools-y += mm-macros missing-macros cmake bc findutils gengetopt patchelf -tools-y += mtools dosfstools libressl fakeroot -tools-$(CONFIG_TARGET_x86) += qemu -tools-$(CONFIG_TARGET_mxs) += elftosb sdimage -tools-$(CONFIG_TARGET_ath79) += lzma-old squashfs -tools-$(CONFIG_USES_MINOR) += kernel2minor -tools-y += lzma squashfskit4 zip zstd +tools-y += autoconf autoconf-archive automake bc bison cmake dosfstools +tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt +tools-y += libressl libtool lzma m4 make-ext4fs missing-macros mkimage +tools-y += mklibs mm-macros mtd-utils mtools padjffs2 patch-image +tools-y += patchelf pkgconf quilt squashfskit4 sstrip zip zlib zstd tools-$(BUILD_B43_TOOLS) += b43-tools tools-$(BUILD_ISL) += isl -tools-$(CONFIG_USE_SPARSE) += sparse +tools-$(BUILD_TOOLCHAIN) += expat gmp libelf mpc mpfr tools-$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini) += genext2fs +tools-$(CONFIG_TARGET_ath79) += lzma-old squashfs +tools-$(CONFIG_TARGET_mxs) += elftosb sdimage tools-$(CONFIG_TARGET_tegra) += cbootimage cbootimage-configs +tools-$(CONFIG_TARGET_x86) += qemu +tools-$(CONFIG_USES_MINOR) += kernel2minor +tools-$(CONFIG_USE_SPARSE) += sparse # builddir dependencies -$(curdir)/bison/compile := $(curdir)/flex/compile -$(curdir)/flex/compile := $(curdir)/libtool/compile -$(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile -$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile -$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile -$(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile $(curdir)/autoconf/compile := $(curdir)/m4/compile $(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/pkgconf/compile $(curdir)/xz/compile +$(curdir)/b43-tools/compile := $(curdir)/bison/compile +$(curdir)/bc/compile := $(curdir)/bison/compile +$(curdir)/bison/compile := $(curdir)/flex/compile +$(curdir)/cbootimage/compile += $(curdir)/automake/compile +$(curdir)/cmake/compile += $(curdir)/libressl/compile +$(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile +$(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile +$(curdir)/findutils/compile := $(curdir)/bison/compile +$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile $(curdir)/zlib/compile +$(curdir)/flex/compile := $(curdir)/libtool/compile +$(curdir)/gengetopt/compile := $(curdir)/libtool/compile $(curdir)/gmp/compile := $(curdir)/libtool/compile +$(curdir)/isl/compile := $(curdir)/gmp/compile +$(curdir)/libelf/compile := $(curdir)/libtool/compile +$(curdir)/libressl/compile := $(curdir)/pkgconf/compile +$(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile +$(curdir)/lzma-old/compile := $(curdir)/zlib/compile +$(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile +$(curdir)/missing-macros/compile := $(curdir)/autoconf/compile +$(curdir)/mkimage/compile += $(curdir)/libressl/compile +$(curdir)/mklibs/compile := $(curdir)/libtool/compile +$(curdir)/mm-macros/compile := $(curdir)/libtool/compile $(curdir)/mpc/compile := $(curdir)/mpfr/compile $(curdir)/gmp/compile $(curdir)/mpfr/compile := $(curdir)/gmp/compile $(curdir)/mtd-utils/compile := $(curdir)/libtool/compile $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile -$(curdir)/mklibs/compile := $(curdir)/libtool/compile -$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile -$(curdir)/mm-macros/compile := $(curdir)/libtool/compile -$(curdir)/missing-macros/compile := $(curdir)/autoconf/compile -$(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile -$(curdir)/libelf/compile := $(curdir)/libtool/compile -$(curdir)/sdcc/compile := $(curdir)/bison/compile -$(curdir)/b43-tools/compile := $(curdir)/bison/compile $(curdir)/padjffs2/compile := $(curdir)/findutils/compile -$(curdir)/isl/compile := $(curdir)/gmp/compile -$(curdir)/bc/compile := $(curdir)/bison/compile -$(curdir)/findutils/compile := $(curdir)/bison/compile -$(curdir)/gengetopt/compile := $(curdir)/libtool/compile $(curdir)/patchelf/compile := $(curdir)/libtool/compile -$(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile -$(curdir)/libressl/compile := $(curdir)/pkgconf/compile -$(curdir)/mkimage/compile += $(curdir)/libressl/compile -$(curdir)/firmware-utils/compile += $(curdir)/libressl/compile $(curdir)/zlib/compile -$(curdir)/cmake/compile += $(curdir)/libressl/compile +$(curdir)/qemu/compile := $(curdir)/e2fsprogs/compile $(curdir)/zlib/compile +$(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile +$(curdir)/sdcc/compile := $(curdir)/bison/compile +$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile +$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/zlib/compile := $(curdir)/cmake/compile -$(curdir)/lzma-old/compile := $(curdir)/zlib/compile -$(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile -$(curdir)/cbootimage/compile += $(curdir)/automake/compile ifneq ($(HOST_OS),Linux) $(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile