Re: [XEN PATCH 56/57] stubdom: build xenstore*-stubdom using new Makefile.common

[Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>]

Anthony PERARD, le lun. 06 déc. 2021 17:02:39 +0000, a ecrit:
> Makefile.common have everything needed by stubdom, when used with
> xenlibs.mk, so we don't need "Makefile" anymore.
> 
> Also, remove DESTDIR for "xenstore" related targets, "xenlibs.mk"
> doesn't use DESTDIR so its value doesn't matter.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>

Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>

> ---
>  stubdom/Makefile | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/stubdom/Makefile b/stubdom/Makefile
> index 6b804824ba..1fa075b9ad 100644
> --- a/stubdom/Makefile
> +++ b/stubdom/Makefile
> @@ -346,8 +346,7 @@ define do_links
>    cd $(dir $@); \
>    ln -sf $(dir $<)include/*.h include/; \
>    ln -sf $(dir $<)*.[ch] .; \
> -  [ -e $(dir $<)Makefile.common ] && ln -sf $(dir $<)Makefile.common . ||:; \
> -  ln -sf $(dir $<)Makefile .
> +  ln -sf $(dir $<)Makefile.common .
>    touch $@
>  endef
>  
> @@ -356,13 +355,11 @@ define BUILD_lib
>   libxen$(1): libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a
>   libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: $$(LIBDEPS_$(1)) $$(LIBDEP_$(1))
>   libs-$$(XEN_TARGET_ARCH)/$(1)/libxen$(1).a: mk-headers-$$(XEN_TARGET_ARCH) 
> $$(NEWLIB_STAMPFILE) .phony
> -     CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) 
> CONFIG_LIBXC_MINIOS=y $$(if $$(wildcard $$(@D)/Makefile.common),-f 
> $(CURDIR)/xenlibs.mk) -C $$(@D) $$(@F)
> +     CPPFLAGS="$$(TARGET_CPPFLAGS)" CFLAGS="$$(TARGET_CFLAGS)" $$(MAKE) 
> CONFIG_LIBXC_MINIOS=y -f $(CURDIR)/xenlibs.mk -C $$(@D) $$(@F)
>  
>   clean-libxen$(1):
>       if [ -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile.common ]; then \
>           $$(MAKE) -f $(CURDIR)/xenlibs.mk -C libs-$$(XEN_TARGET_ARCH)/$(1) 
> clean; \
> -     elif [ -e libs-$$(XEN_TARGET_ARCH)/$(1)/Makefile ]; then \
> -         $$(MAKE) -C libs-$$(XEN_TARGET_ARCH)/$(1) clean; \
>       fi
>  
>   libs-$$(XEN_TARGET_ARCH)/$(1)/stamp: 
> $$(XEN_ROOT)/tools/libs/$(1)/Makefile.common
> @@ -494,7 +491,7 @@ xenstore-minios-config.mk: $(CURDIR)/xenstore-minios.cfg
>  
>  .PHONY: xenstore
>  xenstore: $(CROSS_ROOT) xenstore-minios-config.mk
> -     CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstore-minios-config.mk)" 
> CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C $@ xenstored.a CONFIG_STUBDOM=y
> +     CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstore-minios-config.mk)" 
> CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -f $(CURDIR)/xenlibs.mk -C $@ xenstored.a 
> CONFIG_STUBDOM=y
>  
>  #############
>  # xenstorepvh
> @@ -505,7 +502,7 @@ xenstorepvh-minios-config.mk: 
> $(CURDIR)/xenstorepvh-minios.cfg
>  
>  .PHONY: xenstorepvh
>  xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk
> -     CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstorepvh-minios-config.mk)" 
> CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C $@ xenstored.a CONFIG_STUBDOM=y
> +     CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat xenstorepvh-minios-config.mk)" 
> CFLAGS="$(TARGET_CFLAGS)" $(MAKE) -f $(CURDIR)/xenlibs.mk -C $@ xenstored.a 
> CONFIG_STUBDOM=y
>  
>  ########
>  # minios
> @@ -657,8 +654,8 @@ clean:
>       rm -f *-minios-config.mk
>       rm -fr pkg-config
>       -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean
> -     -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean
> -     -[ ! -d xenstorepvh ] || $(MAKE) DESTDIR= -C xenstorepvh clean
> +     -[ ! -d xenstore ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstore clean
> +     -[ ! -d xenstorepvh ] || $(MAKE) -f $(CURDIR)/xenlibs.mk -C xenstorepvh 
> clean
>  
>  # clean the cross-compilation result
>  .PHONY: crossclean
> -- 
> Anthony PERARD
> 

-- 
Samuel
Now I know someone out there is going to claim, "Well then, UNIX is intuitive,
because you only need to learn 5000 commands, and then everything else follows
from that! Har har har!"
(Andy Bates in comp.os.linux.misc, on "intuitive interfaces", slightly
defending Macs.)