libs,tools/include: Clean "clean" targets

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/stat:
  - don't remove $(DEPS_RM) from here as it is already done in
    "libs.mk".

libs/util:
  - fix clean of version-script file.

include/xen-foreign:
  - remove __pycache__

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>

diff --git a/tools/include/Makefile b/tools/include/Makefile
index d965987f55854b7876488888a6012f82815e4625..3a03a0b0fa4d92b22a0b4c5bf785a334f4cb64a1 100644 (file)
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -82,6 +82,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 6ce51daf5eedea35a50e7c270846ecc67ff91e17..b538d0ea9475bea781ecae95ec4e6c2f2e6e0fba 100644 (file)
--- 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 ef7362327feb929fd2664cc15101f65ed5abcb3f..f58c4ef1aad4a4d47ca39624dfe8064de3d813a3 100644 (file)
--- a/tools/libs/ctrl/Makefile
+++ b/tools/libs/ctrl/Makefile
@@ -54,8 +54,5 @@ NO_HEADERS_CHK := y
 
 include $(XEN_ROOT)/tools/libs/libs.mk
 
-clean: cleanlocal
-
-.PHONY: cleanlocal
-cleanlocal:
+clean::
        rm -f libxenctrl.map

diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile
index 2005d8a67dfd332ee9ab8c5a905beea64f32227c..56483c545fda3af458cec425b6c894405b08984d 100644 (file)
--- a/tools/libs/guest/Makefile
+++ b/tools/libs/guest/Makefile
@@ -104,6 +104,5 @@ include $(XEN_ROOT)/tools/libs/libs.mk
 
 libxenguest.so.$(MAJOR).$(MINOR): LDLIBS += $(ZLIB_LIBS) -lz
 
-.PHONY: cleanlocal
-cleanlocal:
+clean::
        rm -f libxenguest.map

diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk
index a173f59a8b045ef0dfac6c1a3435eb56a07b4e14..c2eaefc9286afd01022539bc37eb3a9e39ce8bbb 100644 (file)
--- a/tools/libs/libs.mk
+++ b/tools/libs/libs.mk
@@ -124,8 +124,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/libs/light/Makefile b/tools/libs/light/Makefile
index 769e2a83e2177284722650223d6ebd6db86a6ac9..0c04a5b5cb759ee2b65bf58fd173f7fc3bb369e9 100644 (file)
--- a/tools/libs/light/Makefile
+++ b/tools/libs/light/Makefile
@@ -246,15 +246,12 @@ 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

diff --git a/tools/libs/stat/Makefile b/tools/libs/stat/Makefile
index 1aef25a9bbd7c73d4ca15872f0df1d7345764ba3..39a671d7eda1f21342559e9528890b778e6481d6 100644 (file)
--- a/tools/libs/stat/Makefile
+++ b/tools/libs/stat/Makefile
@@ -115,9 +115,5 @@ install:: install-perl-bindings
 uninstall:: uninstall-perl-bindings
 endif
 
-clean: cleanlocal
-
-.PHONY: cleanlocal
-cleanlocal:
-       rm -f $(BINDINGS) $(BINDINGSRC) $(DEPS_RM)
-       rm -f libxenstat.map
+clean::
+       $(RM) libxenstat.map $(BINDINGS) $(BINDINGSRC)

diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile
index 72fecb4c495e07b3f1ee5285811125701c82dca7..7a658e9446968aae81e5d3d7b44cd739a01b8ddf 100644 (file)
--- a/tools/libs/util/Makefile
+++ b/tools/libs/util/Makefile
@@ -49,8 +49,5 @@ $(LIB_OBJS) $(PIC_OBJS): $(AUTOINCS)
        @rm -f $*.[ch]
        $(FLEX) --header-file=$*.h --outfile=$*.c $<
 
-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 83a45d2817b8b465e12603cc0f23c35cf8ea31a0..4ccb4dd1f60b39f49f7ba8dae03cacdcf297c381 100644 (file)
--- a/tools/libs/vchan/Makefile
+++ b/tools/libs/vchan/Makefile
@@ -12,8 +12,5 @@ NO_HEADERS_CHK := y
 
 include $(XEN_ROOT)/tools/libs/libs.mk
 
-clean: cleanlocal
-
-.PHONY: cleanlocal
-cleanlocal:
+clean::
        rm -f libxenvchan.map