[LTP] [PATCH v2 2/2] include/Makefile: Fix cleaning targets

Ricardo B. Marlière rbm@suse.com
Tue Apr 8 15:44:01 CEST 2025


From: Ricardo B. Marlière <rbm@suse.com>

Add ac-clean target as dependency of ac-maintainer-clean and add missing
files to the removal list. This way the project top level Makefile cleaning
targets can make use of it. Also, add "compile" to the AUTOMAKE_FILES
list.

Cc: Andrea Cervesato <andrea.cervesato@suse.com>
Fixes: 817d8095fbfe ("Rename linux_syscall_numbers.h to lapi/syscalls.h")
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
---

NOTE: The "compile" file is added during the autotools target:
$ make autotools
<snip>
configure.ac:26: installing './compile'
configure.ac:24: installing './config.guess'
configure.ac:24: installing './config.sub'
configure.ac:7: installing './install-sh'
configure.ac:7: installing './missing'
<snip>
---
 include/Makefile       | 4 ++--
 include/mk/automake.mk | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/Makefile b/include/Makefile
index 25e96df9b8cdd7d1d7e6f19925bf2160d682f0d9..6b31b046e452e71afb5097cc3fadf8af01282629 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -18,8 +18,8 @@ MAKE_TARGETS		:=
 distclean:: clean ac-distclean
 maintainer-clean:: distclean ac-maintainer-clean
 ac-clean ac-distclean::
-	$(RM) -f config.h
-ac-maintainer-clean::
+	$(RM) -f config.h lapi/syscalls.h stamp-h1
+ac-maintainer-clean:: ac-clean
 	$(RM) -f config.h.in
 
 vpath %.h $(abs_srcdir)
diff --git a/include/mk/automake.mk b/include/mk/automake.mk
index 3df3b4ba99ca865caa89388999e53cbc500615dc..b0ff95ff072c61e0d34b5a308063889b5e5e6cd8 100644
--- a/include/mk/automake.mk
+++ b/include/mk/automake.mk
@@ -45,7 +45,7 @@ m4/ltp-version.m4: VERSION
 	sed -n '1{s:LTP-:m4_define([LTP_VERSION],[:;s:$$:]):;p;q}' $< > $@
 
 .PHONY: automake
-AUTOMAKE_FILES := config.guess config.sub install-sh missing stamp-h1
+AUTOMAKE_FILES := compile config.guess config.sub install-sh missing
 automake: aclocal $(AUTOMAKE_FILES)
 $(AUTOMAKE_FILES): m4/Makefile.in
 m4/Makefile.in: m4/Makefile.am aclocal.m4
@@ -55,8 +55,8 @@ m4/Makefile.in: m4/Makefile.am aclocal.m4
 ac-clean::
 	$(RM) -rf autom4te.cache
 	$(RM) -f config.log config.status
-	$(RM) -f include/config.h include/stamp-h1
 	$(RM) -f m4/Makefile m4/ltp-version.m4
+	$(MAKE) -C "$(top_srcdir)/include" $@;
 	for d in $(AUTOCONFED_SUBDIRS); do \
 	    $(MAKE) -C "$(top_srcdir)/$$d" $@; \
 	done
@@ -67,7 +67,7 @@ ac-maintainer-clean:: ac-distclean
 	    $(MAKE) -C "$(top_srcdir)/$$d" $@; \
 	done
 	$(RM) -f aclocal.m4 configure $(AUTOMAKE_FILES) m4/Makefile.in
-	$(RM) -f include/*config.h.in
+	$(MAKE) -C "$(top_srcdir)/include" $@;
 
 # Don't include config.h, or make will (rightfully) whine about overriding
 # rules.

-- 
2.49.0



More information about the ltp mailing list