diff mbox series

multipath-tools Makefiles: handle dependency files correctly

Message ID 20230320155550.7326-1-mwilck@suse.com (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show
Series multipath-tools Makefiles: handle dependency files correctly | expand

Commit Message

Martin Wilck March 20, 2023, 3:55 p.m. UTC 
From: Martin Wilck <mwilck@suse.com>

Some generated .d files were not correctly included, and not
removed with "make dep_clean". Fix it.

Reported-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 libmultipath/Makefile | 4 ++--
 multipathd/Makefile   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Martin Wilck March 23, 2023, 11:53 a.m. UTC | #1 
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@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
> 
> Some generated .d files were not correctly included, and not
> removed with "make dep_clean". Fix it.
> 
> Reported-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
>  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@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
Benjamin Marzinski March 23, 2023, 2:36 p.m. UTC | #2 
On Mon, Mar 20, 2023 at 04:55:50PM +0100, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
> 
> Some generated .d files were not correctly included, and not
> removed with "make dep_clean". Fix it.
> 
> Reported-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>

Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>

> ---
>  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)
> -- 
> 2.39.2
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
Xose Vazquez Perez March 23, 2023, 2:57 p.m. UTC | #3 
On 3/20/23 16:55, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
> 
> Some generated .d files were not correctly included, and not
> removed with "make dep_clean". Fix it.
> 
> Reported-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
> Signed-off-by: Martin Wilck <mwilck@suse.com>

Tested-by: Xose Vazquez Perez <xose.vazquez@gmail.com>

> ---
>   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@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
Xose Vazquez Perez March 23, 2023, 3:01 p.m. UTC | #4 
On 3/23/23 12:53, Martin Wilck wrote:

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

There is a pending Gentoo patch from Sam James:
https://listman.redhat.com/archives/dm-devel/2023-March/053587.html

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
diff mbox series

Patch

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)