Re: [PATCH] tools: usb: move to tools buildsystem

[Andy Shevchenko]

On Wed, Aug 19, 2020 at 10:17 AM Heikki Krogerus
<heikki.krogerus@xxxxxxxxxxxxxxx> wrote:
>
> Converting the Makefile to use the new tools buildsystem.

In particular it allows you to build with `make O=...` which is very helpful!

Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>

> Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
>  tools/usb/Build    |  2 ++
>  tools/usb/Makefile | 53 +++++++++++++++++++++++++++++++++++++++-------
>  2 files changed, 47 insertions(+), 8 deletions(-)
>  create mode 100644 tools/usb/Build
>
> diff --git a/tools/usb/Build b/tools/usb/Build
> new file mode 100644
> index 0000000000000..2ad6f97458168
> --- /dev/null
> +++ b/tools/usb/Build
> @@ -0,0 +1,2 @@
> +testusb-y += testusb.o
> +ffs-test-y += ffs-test.o
> diff --git a/tools/usb/Makefile b/tools/usb/Makefile
> index 01d758d73b6db..1b128e551b2e4 100644
> --- a/tools/usb/Makefile
> +++ b/tools/usb/Makefile
> @@ -1,14 +1,51 @@
>  # SPDX-License-Identifier: GPL-2.0
>  # Makefile for USB tools
> +include ../scripts/Makefile.include
>
> -PTHREAD_LIBS = -lpthread
> -WARNINGS = -Wall -Wextra
> -CFLAGS = $(WARNINGS) -g -I../include
> -LDFLAGS = $(PTHREAD_LIBS)
> +bindir ?= /usr/bin
>
> -all: testusb ffs-test
> -%: %.c
> -       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
> +ifeq ($(srctree),)
> +srctree := $(patsubst %/,%,$(dir $(CURDIR)))
> +srctree := $(patsubst %/,%,$(dir $(srctree)))
> +endif
> +
> +# Do not use make's built-in rules
> +# (this improves performance and avoids hard-to-debug behaviour);
> +MAKEFLAGS += -r
> +
> +override CFLAGS += -O2 -Wall -Wextra -g -D_GNU_SOURCE -I$(OUTPUT)include -I$(srctree)/tools/include
> +override LDFLAGS += -lpthread
> +
> +ALL_TARGETS := testusb ffs-test
> +ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
> +
> +all: $(ALL_PROGRAMS)
> +
> +export srctree OUTPUT CC LD CFLAGS
> +include $(srctree)/tools/build/Makefile.include
> +
> +TESTUSB_IN := $(OUTPUT)testusb-in.o
> +$(TESTUSB_IN): FORCE
> +       $(Q)$(MAKE) $(build)=testusb
> +$(OUTPUT)testusb: $(TESTUSB_IN)
> +       $(QUIET_LINK)$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
> +
> +FFS_TEST_IN := $(OUTPUT)ffs-test-in.o
> +$(FFS_TEST_IN): FORCE
> +       $(Q)$(MAKE) $(build)=ffs-test
> +$(OUTPUT)ffs-test: $(FFS_TEST_IN)
> +       $(QUIET_LINK)$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
>
>  clean:
> -       $(RM) testusb ffs-test
> +       rm -f $(ALL_PROGRAMS)
> +       find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.d' -delete -o -name '\.*.o.cmd' -delete
> +
> +install: $(ALL_PROGRAMS)
> +       install -d -m 755 $(DESTDIR)$(bindir);          \
> +       for program in $(ALL_PROGRAMS); do              \
> +               install $$program $(DESTDIR)$(bindir);  \
> +       done
> +
> +FORCE:
> +
> +.PHONY: all install clean FORCE prepare
> --
> 2.28.0
>


-- 
With Best Regards,
Andy Shevchenko