| Message ID | 20211206170241.13165-43-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Toolstack build system improvement, toward non-recursive makefiles | expand |
On 06.12.21 18:02, Anthony PERARD wrote: > There is no need for an extra "cleanlocal" target, we can use > double-colon rules instead. > > Generated headers are now in tools/include/, so remove those file > there. > > Remove -f flag as it's already in $(RM). > > libs.mk: > - don't try to remove "*.rpm" anymore. > > libs/light: > - "_paths.*.tmp" isn't created anymore. > - clean "libxenlight_test.so" and "libxl_test_*.opic". > > libs/util: > - fix clean of version-script file. > > include/xen-foreign: > - remove __pycache__ > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Same remark regarding double-colon rules as for last patch. Juergen
diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index 7f2c676be4..3078e45cf4 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -121,8 +121,8 @@ TAGS: etags -t *.c *.h .PHONY: clean -clean: - rm -rf *.rpm $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS) +clean:: + rm -rf $(LIB) *~ $(DEPS_RM) $(LIB_OBJS) $(PIC_OBJS) rm -f lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f headers.chk headers.lst rm -f $(PKG_CONFIG) diff --git a/tools/include/Makefile b/tools/include/Makefile index 42605d46b9..a9c11d06c8 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -80,6 +80,7 @@ uninstall: clean: rm -rf xen xen-xsm acpi $(MAKE) -C xen-foreign clean + rm -f _*.h .PHONY: dist dist: install diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index 6ce51daf5e..b538d0ea94 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -13,6 +13,7 @@ clean: rm -f $(headers) rm -f checker checker.c rm -f *.pyc *.o *~ + rm -rf __pycache__ distclean: clean diff --git a/tools/libs/ctrl/Makefile b/tools/libs/ctrl/Makefile index 5d866b8d04..a46e30a168 100644 --- a/tools/libs/ctrl/Makefile +++ b/tools/libs/ctrl/Makefile @@ -56,8 +56,5 @@ include $(XEN_ROOT)/tools/libs/libs.mk -include $(DEPS_INCLUDE) -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f libxenctrl.map diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 636b4ea5cb..67837c4e73 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -106,6 +106,5 @@ libxenguest.so.$(MAJOR).$(MINOR): LDLIBS += $(ZLIB_LIBS) -lz -include $(DEPS_INCLUDE) -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f libxenguest.map diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 5e52db9b30..719630eda2 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -250,17 +250,14 @@ install:: $(LIBHEADERS) libxl-save-helper uninstall:: rm -f $(DESTDIR)$(LIBEXEC_BIN)/libxl-save-helper -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: - $(RM) -f _*.h *.o $(CLIENTS) - $(RM) -f _*.c *.pyc _paths.*.tmp _*.api-for-check - $(RM) -f testidl.c.new testidl.c *.api-ok - $(RM) -f $(TEST_PROGS) - $(RM) -rf __pycache__ - $(RM) -f libxenlight.map - $(RM) -f $(AUTOSRCS) $(AUTOINCS) +clean:: + $(RM) _*.h *.o $(CLIENTS) + $(RM) _*.c *.pyc _*.api-for-check + $(RM) testidl.c.new testidl.c *.api-ok + $(RM) $(TEST_PROGS) libxenlight_test.so libxl_test_*.opic + $(RM) -r __pycache__ + $(RM) libxenlight.map + $(RM) $(AUTOSRCS) $(AUTOINCS) $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean -include $(DEPS_INCLUDE) diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile index c8c81048c0..24b5949b3e 100644 --- a/tools/libs/stat/Makefile +++ b/tools/libs/stat/Makefile @@ -115,10 +115,7 @@ install: install-perl-bindings uninstall: uninstall-perl-bindings endif -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM) rm -f libxenstat.map diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index 87425d862a..4e41bc9ff0 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -51,8 +51,5 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS) -include $(DEPS_INCLUDE) -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: - $(RM) -f libxlutil.map +clean:: + $(RM) libxenutil.map diff --git a/tools/libs/vchan/Makefile b/tools/libs/vchan/Makefile index df112f1b88..f6f1002800 100644 --- a/tools/libs/vchan/Makefile +++ b/tools/libs/vchan/Makefile @@ -13,8 +13,5 @@ NO_HEADERS_CHK := y include $(XEN_ROOT)/tools/libs/libs.mk -include $(DEPS_INCLUDE) -clean: cleanlocal - -.PHONY: cleanlocal -cleanlocal: +clean:: rm -f libxenvchan.map
There is no need for an extra "cleanlocal" target, we can use double-colon rules instead. Generated headers are now in tools/include/, so remove those file there. Remove -f flag as it's already in $(RM). libs.mk: - don't try to remove "*.rpm" anymore. libs/light: - "_paths.*.tmp" isn't created anymore. - clean "libxenlight_test.so" and "libxl_test_*.opic". libs/util: - fix clean of version-script file. include/xen-foreign: - remove __pycache__ Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- tools/libs/libs.mk | 4 ++-- tools/include/Makefile | 1 + tools/include/xen-foreign/Makefile | 1 + tools/libs/ctrl/Makefile | 5 +---- tools/libs/guest/Makefile | 3 +-- tools/libs/light/Makefile | 19 ++++++++----------- tools/libs/stat/Makefile | 5 +---- tools/libs/util/Makefile | 7 ++----- tools/libs/vchan/Makefile | 5 +---- 9 files changed, 18 insertions(+), 32 deletions(-)