From 4fe328b39be6188d7e470260943e7b6aba739422 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Fri, 11 Nov 2022 09:23:38 +1100 Subject: [PATCH] LU-8837 ptlrpc: fix problem with distclean "make distclean" follows the filesystem hierarchy so ldlm/Makefile will be cleaned before ptlrpc/Makefile is read, which triggers an error now that ptlrpc/Makefile tries to include ldlm/Makefile This is an uninteresting error as we don't need to include ldlm/Makefile in the distclean case. So replace the "include" with "-include" which suppresses the error. Fixes: f32bdde0574d ("LU-8837 lustre: make ldlm and target file lists") Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: I66c4552b3806113450f9636b7916aff7ed69bda3 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49126 Tested-by: James Simmons Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/ptlrpc/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in index 470941a..dcd5169 100644 --- a/lustre/ptlrpc/Makefile.in +++ b/lustre/ptlrpc/Makefile.in @@ -17,8 +17,8 @@ nodemap_objs := nodemap_handler.o nodemap_lproc.o nodemap_range.o nodemap_objs += nodemap_idmap.o nodemap_rbtree.o nodemap_member.o nodemap_objs += nodemap_storage.o -include $(ptlrpc_dir)/../ldlm/Makefile -include $(ptlrpc_dir)/../target/Makefile +-include $(ptlrpc_dir)/../ldlm/Makefile +-include $(ptlrpc_dir)/../target/Makefile ptlrpc-objs := $(ptlrpc_objs) ptlrpc-objs += $(patsubst %,$(LDLM)%,$(ldlm_objs)) -- 1.8.3.1