Re: [XEN PATCH 37/57] tools/xentop: rework makefile

[Andrew Cooper <amc96@xxxxxxxx>]

On 06/12/2021 17:02, Anthony PERARD wrote:
> diff --git a/tools/xentop/Makefile b/tools/xentop/Makefile
> index 0034114684..1e52b29b37 100644
> --- a/tools/xentop/Makefile
> +++ b/tools/xentop/Makefile
> @@ -13,24 +13,23 @@
>  XEN_ROOT=$(CURDIR)/../..
>  include $(XEN_ROOT)/tools/Rules.mk
>  
> -ifneq ($(XENSTAT_XENTOP),y)
> -.PHONY: all install xentop uninstall
> -all install xentop uninstall:
> -else
> -
>  CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat)
>  LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) 
> -lm
>  CFLAGS += -DHOST_$(XEN_OS)
>  
>  # Include configure output (config.h)
>  CFLAGS += -include $(XEN_ROOT)/tools/config.h
> -LDFLAGS += $(APPEND_LDFLAGS)
> +
> +TARGETS := xentop
>  
>  .PHONY: all
> -all: xentop
> +all: $(TARGETS)
> +
> +xentop: xentop.o
> +     $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS)
>  
>  .PHONY: install
> -install: xentop
> +install: all
>       $(INSTALL_DIR) $(DESTDIR)$(sbindir)
>       $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop

$(TARGETS) ?

>  
> @@ -38,11 +37,9 @@ install: xentop
>  uninstall:
>       rm -f $(DESTDIR)$(sbindir)/xentop
>  
> -endif
> -
>  .PHONY: clean
>  clean:
> -     rm -f xentop xentop.o $(DEPS_RM)
> +     rm -f $(TARGETS) xentop.o $(DEPS_RM)

$(RM) *.o ?

~Andrew

>  
>  .PHONY: distclean
>  distclean: clean