Re: [PATCH] multipath-tools Makefiles: handle dependency files correctly

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Xose, Ben,

when this gets a Reviewed-by, I'd prepare a new submission to
Christophe (unless someone objects).

Martin

On Mon, 2023-03-20 at 16:55 +0100, mwilck@xxxxxxxx wrote:
> From: Martin Wilck <mwilck@xxxxxxxx>
> 
> Some generated .d files were not correctly included, and not
> removed with "make dep_clean". Fix it.
> 
> Reported-by: Xose Vazquez Perez <xose.vazquez@xxxxxxxxx>
> Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
> ---
>  libmultipath/Makefile | 4 ++--
>  multipathd/Makefile   | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/libmultipath/Makefile b/libmultipath/Makefile
> index 61aa611..85767ab 100644
> --- a/libmultipath/Makefile
> +++ b/libmultipath/Makefile
> @@ -71,7 +71,7 @@ uninstall:
>  clean: dep_clean
>         $(Q)$(RM) core *.a *.o *.so *.so.* *.abi nvme-ioctl.c nvme-
> ioctl.h autoconfig.h $(NV_VERSION_SCRIPT)
>  
> -include $(wildcard $(OBJS:.o=.d))
> +include $(wildcard $(OBJS:.o=.d) $(OBJS-T:.o=.d))
>  
>  dep_clean:
> -       $(Q)$(RM) $(OBJS:.o=.d)
> +       $(Q)$(RM) $(OBJS:.o=.d) $(OBJS-T:.o=.d)
> diff --git a/multipathd/Makefile b/multipathd/Makefile
> index 9d53132..dca8e10 100644
> --- a/multipathd/Makefile
> +++ b/multipathd/Makefile
> @@ -81,7 +81,7 @@ uninstall:
>  clean: dep_clean
>         $(Q)$(RM) core *.o $(EXEC) $(CLI)
>  
> -include $(wildcard $(OBJS:.o=.d))
> +include $(wildcard $(OBJS:.o=.d) $(CLI_OBJS:.o=.d))
>  
>  dep_clean:
> -       $(Q)$(RM) $(OBJS:.o=.d)
> +       $(Q)$(RM) $(OBJS:.o=.d) $(CLI_OBJS:.o=.d)

--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://listman.redhat.com/mailman/listinfo/dm-devel





[Index of Archives]     [DM Crypt]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Packaging]     [Fedora SELinux]     [Yosemite Discussion]     [KDE Users]     [Fedora Docs]

  Powered by Linux