diff mbox series

[v4] include/Makefile: Fix cleaning targets

Message ID 20250425-fix_make_clean-v4-1-65d28c11b4ef@suse.com
State Accepted
Headers show
Series [v4] include/Makefile: Fix cleaning targets | expand

Checks

Context Check Description
ltpci/debian_stable_s390x-linux-gnu-gcc_s390x success success
ltpci/debian_stable_powerpc64le-linux-gnu-gcc_ppc64el success success
ltpci/debian_stable_aarch64-linux-gnu-gcc_arm64 success success
ltpci/debian_stable_gcc success success
ltpci/ubuntu_jammy_gcc success success
ltpci/debian_stable_gcc success success
ltpci/opensuse-leap_latest_gcc success success
ltpci/ubuntu_bionic_gcc success success
ltpci/debian_oldstable_clang success success
ltpci/quay-io-centos-centos_stream9_gcc success success
ltpci/fedora_latest_clang success success
ltpci/debian_testing_gcc success success
ltpci/alpine_latest_gcc success success
ltpci/debian_oldstable_gcc success success
ltpci/opensuse-archive_42-2_gcc success success
ltpci/debian_testing_clang success success

Commit Message

Ricardo B. Marlière April 25, 2025, 9:07 p.m. UTC 
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 and move stamp-h1 to where it's actually created: within include/
directory.

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>
---
Changes in v4:
- Defined $CLEAN_SUBDIRS
- Fixed git commit message
- Link to v3: https://lore.kernel.org/r/20250409-fix_make_clean-v3-0-a33a84b2be05@suse.com

Changes in v3:
- Added "include" dir to existing for loop instead of adding a new $(MAKE)
  directive.
- Added it also to `make distclean` target.
- Link to v2: https://lore.kernel.org/r/20250408-fix_make_clean-v2-0-48f93c3dd0bf@suse.com

Changes in v2:
- Dropped the commit that added files to ac-maintainer-clean target
	(They're already in AUTOMAKE_FILES, thanks P. Vorel!)
- Added "compile" file to the AUTOMAKE_FILES list
- Added missing call to include/Makefile to ac-maintainer-clean target
- Link to v1: https://lore.kernel.org/r/20250327-fix_make_clean-v1-0-8b9ed2a8d96a@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 | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)


---
base-commit: c12387876a40837aa93aac6e50331705ed0ff393
change-id: 20250327-fix_make_clean-8e57ffe1ce2c

Best regards,

Comments

Petr Vorel April 28, 2025, 7:08 a.m. UTC | #1 
Hi Ricardo,

merged, thanks!

Kind regards,
Petr
diff mbox series

Patch

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..a58f4042457c6c297cdda838f32f21a998d96230 100644
--- a/include/mk/automake.mk
+++ b/include/mk/automake.mk
@@ -13,6 +13,8 @@  AUTOMAKE	?= automake
 AUTOCONFED_SUBDIRS	= \
 			testcases/open_posix_testsuite
 
+CLEAN_SUBDIRS = $(AUTOCONFED_SUBDIRS) include
+
 # We want to run this every single time to ensure that all of the prereq files
 # are there.
 .PHONY: testcases/open_posix_testsuite/configure
@@ -45,7 +47,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,19 +57,17 @@  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
-	for d in $(AUTOCONFED_SUBDIRS); do \
+	for d in $(CLEAN_SUBDIRS); do \
 	    $(MAKE) -C "$(top_srcdir)/$$d" $@; \
 	done
 
 ac-distclean:: ac-clean
 ac-maintainer-clean:: ac-distclean
-	for d in $(AUTOCONFED_SUBDIRS); do \
+	for d in $(CLEAN_SUBDIRS); do \
 	    $(MAKE) -C "$(top_srcdir)/$$d" $@; \
 	done
 	$(RM) -f aclocal.m4 configure $(AUTOMAKE_FILES) m4/Makefile.in
-	$(RM) -f include/*config.h.in
 
 # Don't include config.h, or make will (rightfully) whine about overriding
 # rules.
@@ -82,7 +82,7 @@  AUTOGENERATED_FILES	= \
 			m4/Makefile
 
 distclean:: %: clean ac-distclean
-	for d in $(AUTOCONFED_SUBDIRS); do \
+	for d in $(CLEAN_SUBDIRS); do \
 	    $(MAKE) -C "$(top_srcdir)/$$d" $@; \
 	done
 	$(RM) -f $(AUTOGENERATED_FILES)