[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools: fix "make distclean"



commit f9c9b127753e9eddf532d3133f57321dc3d927e4
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Tue Jan 20 13:31:12 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Jan 27 16:34:45 2015 +0000

    tools: fix "make distclean"
    
    The original rule to target "distclean" in tools/Rules.mk was in effect
    "make clean". It should be "make distclean".
    
    However not all Makefiles in subdirectories have distclean target
    defined. So this patch also adds a bunch of distclean targets to various
    Makefiles. They only depend on clean target and don't have any actions
    in most cases.
    
    With the patch applied, following command outputs 0 results:
    
      find tools -name 'Makefile*' -exec grep -L 'distclean' {} \+ \
         | grep -v ocaml | grep -v libfsimage
    
    Ocaml and libfsimage are known to have distclean defined in a dedicated
    rules file.
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 tools/Rules.mk                                |    2 +-
 tools/blktap2/Makefile                        |    6 ++++--
 tools/blktap2/control/Makefile                |    4 +++-
 tools/blktap2/drivers/Makefile                |    4 +++-
 tools/blktap2/include/Makefile                |    3 +++
 tools/blktap2/lvm/Makefile                    |    4 +++-
 tools/blktap2/vhd/Makefile                    |    4 +++-
 tools/blktap2/vhd/lib/Makefile                |    4 +++-
 tools/console/Makefile                        |    3 +++
 tools/console/testsuite/Makefile              |    5 ++++-
 tools/debugger/gdbsx/Makefile                 |    4 ++++
 tools/debugger/gdbsx/gx/Makefile              |    2 ++
 tools/debugger/gdbsx/xg/Makefile              |    2 ++
 tools/debugger/kdd/Makefile                   |    3 +++
 tools/examples/Makefile                       |    3 +++
 tools/firmware/hvmloader/Makefile             |    3 +++
 tools/firmware/hvmloader/acpi/Makefile        |    2 ++
 tools/firmware/rombios/32bit/Makefile         |    3 +++
 tools/firmware/rombios/32bit/tcgbios/Makefile |    3 +++
 tools/firmware/rombios/Makefile               |    3 +++
 tools/firmware/vgabios/Makefile               |    3 +++
 tools/flask/Makefile                          |    4 ++--
 tools/flask/policy/Makefile                   |    4 +++-
 tools/flask/utils/Makefile                    |    3 +++
 tools/hotplug/FreeBSD/Makefile                |    3 +++
 tools/hotplug/Linux/Makefile                  |    3 +++
 tools/hotplug/Linux/systemd/Makefile          |    3 +++
 tools/hotplug/Makefile                        |    4 ++--
 tools/hotplug/NetBSD/Makefile                 |    3 +++
 tools/hotplug/common/Makefile                 |    3 +++
 tools/include/Makefile                        |    3 +++
 tools/include/xen-foreign/Makefile            |    4 +++-
 tools/libxc/Makefile                          |    3 +++
 tools/memshr/Makefile                         |    5 ++++-
 tools/misc/Makefile                           |    3 +++
 tools/ocaml/Makefile                          |    3 +++
 tools/ocaml/Makefile.rules                    |    2 ++
 tools/ocaml/libs/Makefile                     |    3 +++
 tools/pygrub/Makefile                         |    3 +++
 tools/python/Makefile                         |    3 +++
 tools/tests/mce-test/Makefile                 |    5 ++++-
 tools/tests/mce-test/tools/Makefile           |    3 +++
 tools/tests/mem-sharing/Makefile              |    3 +++
 tools/tests/regression/Makefile               |    4 ++--
 tools/tests/vhpet/Makefile                    |    3 +++
 tools/tests/x86_emulator/Makefile             |    3 +++
 tools/tests/xen-access/Makefile               |    3 +++
 tools/xcutils/Makefile                        |    3 +++
 tools/xenbackendd/Makefile                    |    3 +++
 tools/xenmon/Makefile                         |    3 +++
 tools/xenpaging/Makefile                      |    4 +++-
 tools/xenpmd/Makefile                         |    3 +++
 tools/xenstat/Makefile                        |    4 ++--
 tools/xenstat/libxenstat/Makefile             |    3 +++
 tools/xenstat/xentop/Makefile                 |    3 +++
 tools/xenstore/Makefile                       |    3 +++
 tools/xentrace/Makefile                       |    3 +++
 57 files changed, 166 insertions(+), 22 deletions(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 962a743..74cf37e 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -121,7 +121,7 @@ subdir-all-% subdir-clean-% subdir-install-%: .phony
        $(MAKE) -C $* $(patsubst subdir-%-$*,%,$@)
 
 subdir-distclean-%: .phony
-       $(MAKE) -C $* clean
+       $(MAKE) -C $* distclean
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Tools.mk:
diff --git a/tools/blktap2/Makefile b/tools/blktap2/Makefile
index d41758f..94200dc 100644
--- a/tools/blktap2/Makefile
+++ b/tools/blktap2/Makefile
@@ -14,5 +14,7 @@ SUBDIRS-$(CONFIG_Linux) += control
 clean:
        rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) TAGS
 
-.PHONY: all clean install
-all clean install: %: subdirs-%
+distclean: clean
+
+.PHONY: all clean install distclean
+all clean install distclean: %: subdirs-%
diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index a88ff4c..1ae6902 100644
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -73,6 +73,8 @@ clean:
        rm -f $(LIBNAME).so $(LIBSONAME)
        rm -f *~
 
-.PHONY: all build clean install
+distclean: clean
+
+.PHONY: all build clean distclean install
 
 -include $(DEPS)
diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile
index 3476fc1..2f96c91 100644
--- a/tools/blktap2/drivers/Makefile
+++ b/tools/blktap2/drivers/Makefile
@@ -108,4 +108,6 @@ install: all
 clean:
        rm -rf .*.d *.o *~ xen TAGS $(IBIN) $(LIB) $(LOCK_UTIL) $(QCOW_UTIL)
 
-.PHONY: clean install
+distclean: clean
+
+.PHONY: clean install distclean
diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile
index f85351e..c238486 100644
--- a/tools/blktap2/include/Makefile
+++ b/tools/blktap2/include/Makefile
@@ -12,3 +12,6 @@ install:
 .PHONY: clean
 clean:
        @:
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile
index cf8a53b..7d5f8ea 100644
--- a/tools/blktap2/lvm/Makefile
+++ b/tools/blktap2/lvm/Makefile
@@ -29,6 +29,8 @@ lvm-util: lvm-util.o
 clean:
        rm -rf *.o *.opic *~ $(DEPS) $(IBIN)
 
-.PHONY: all build clean install lvm-util
+distclean: clean
+
+.PHONY: all build clean distclean install lvm-util
 
 -include $(DEPS)
diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index fef0d36..9e21cce 100644
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -44,6 +44,8 @@ install: all
 clean: subdirs-clean
        rm -rf *.o *~ $(DEPS) $(IBIN)
 
-.PHONY: all build clean install vhd-util vhd-update
+distclean: clean
+
+.PHONY: all build clean distclean install vhd-util vhd-update
 
 -include $(DEPS)
diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
index 99e3cdb..3904e97 100644
--- a/tools/blktap2/vhd/lib/Makefile
+++ b/tools/blktap2/vhd/lib/Makefile
@@ -75,6 +75,8 @@ install: all
 clean:
        rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
 
-.PHONY: all build clean install libvhd
+distclean: clean
+
+.PHONY: all build clean distclean install libvhd
 
 -include $(DEPS)
diff --git a/tools/console/Makefile b/tools/console/Makefile
index 6e55618..239ec60 100644
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -22,6 +22,9 @@ clean:
        $(RM) *.a *.so *.o *.rpm $(BIN) $(DEPS)
        $(RM) client/*.o daemon/*.o
 
+.PHONY: distclean
+distclean: clean
+
 xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
        $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(LDLIBS_xenconsoled) 
$(APPEND_LDFLAGS)
 
diff --git a/tools/console/testsuite/Makefile b/tools/console/testsuite/Makefile
index d9e4380..85501fd 100644
--- a/tools/console/testsuite/Makefile
+++ b/tools/console/testsuite/Makefile
@@ -11,4 +11,7 @@ console-domU: console-domU.o
 procpipe: procpipe.o
 
 .PHONY: clean
-clean:; $(RM) *.o console-domU console-dom0 procpipe
+clean: $(RM) *.o console-domU console-dom0 procpipe
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile
index 7938dd8..31eb900 100644
--- a/tools/debugger/gdbsx/Makefile
+++ b/tools/debugger/gdbsx/Makefile
@@ -12,6 +12,10 @@ clean:
        rm -f xg_all.a gx_all.a gdbsx
        set -e; for d in xg gx; do $(MAKE) -C $$d clean; done
 
+.PHONY: distclean
+distclean: clean
+       set -e; for d in xg gx; do $(MAKE) -c $$d distclean; done
+
 .PHONY: install
 install: all
        [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
diff --git a/tools/debugger/gdbsx/gx/Makefile b/tools/debugger/gdbsx/gx/Makefile
index 9a0ff07..3b8467f 100644
--- a/tools/debugger/gdbsx/gx/Makefile
+++ b/tools/debugger/gdbsx/gx/Makefile
@@ -11,6 +11,8 @@ all: gx_all.a
 clean:
        rm -rf gx_all.a *.o .*.d
 
+.PHONY: distclean
+distclean: clean
 
 #%.o: %.c $(GX_HDRS) Makefile
 #      $(CC) -c $(CFLAGS) -o $@ $<
diff --git a/tools/debugger/gdbsx/xg/Makefile b/tools/debugger/gdbsx/xg/Makefile
index 7638633..78b4021 100644
--- a/tools/debugger/gdbsx/xg/Makefile
+++ b/tools/debugger/gdbsx/xg/Makefile
@@ -33,3 +33,5 @@ xen-headers:
 clean:
        rm -rf xen xg_all.a $(XG_OBJS)  .*.d
 
+.PHONY: distclean
+distclean: clean
diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile
index 34b781f..8eafc82 100644
--- a/tools/debugger/kdd/Makefile
+++ b/tools/debugger/kdd/Makefile
@@ -16,6 +16,9 @@ kdd: $(OBJS)
 clean:
        rm -f $(OBJS) $(DEPS) kdd
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install: all
        [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 473580e..87dd760 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -43,3 +43,6 @@ install-configs: $(XEN_CONFIGS)
 
 .PHONY: clean
 clean:
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/firmware/hvmloader/Makefile 
b/tools/firmware/hvmloader/Makefile
index 46a79c5..b759e81 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -139,4 +139,7 @@ clean: subdirs-clean
        rm -f roms.inc roms.inc.new acpi.h
        rm -f hvmloader hvmloader.tmp *.o $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)
diff --git a/tools/firmware/hvmloader/acpi/Makefile 
b/tools/firmware/hvmloader/acpi/Makefile
index 2c50851..8d91881 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -66,6 +66,8 @@ clean:
        rm -rf *.a *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
        rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*.asl
 
+distclean: clean
+
 install: all
 
 -include $(DEPS)
diff --git a/tools/firmware/rombios/32bit/Makefile 
b/tools/firmware/rombios/32bit/Makefile
index e5d1cbc..396906c 100644
--- a/tools/firmware/rombios/32bit/Makefile
+++ b/tools/firmware/rombios/32bit/Makefile
@@ -15,6 +15,9 @@ all: subdirs-all
 clean: subdirs-clean
        rm -rf *.o $(TARGET) $(DEPS)
 
+.PHONY: distclean
+distclean: subdirs-distclean
+
 $(TARGET): 32bitbios_all.o
        sh mkhex highbios_array 32bitbios_all.o > $@
 
diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile 
b/tools/firmware/rombios/32bit/tcgbios/Makefile
index ddb0471..f6f2649 100644
--- a/tools/firmware/rombios/32bit/tcgbios/Makefile
+++ b/tools/firmware/rombios/32bit/tcgbios/Makefile
@@ -12,6 +12,9 @@ all: $(TARGET)
 clean:
        rm -rf *.o $(TARGET) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 $(TARGET): tcgbios.o tpm_drivers.o
        $(LD) $(LDFLAGS_DIRECT) -r $^ -o $@
 
diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile
index 2f2e409..94e65db 100644
--- a/tools/firmware/rombios/Makefile
+++ b/tools/firmware/rombios/Makefile
@@ -15,6 +15,9 @@ clean: subdirs-clean
        rm -f  BIOS-bochs-*
        rm -f  $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c
        gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c
        bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c
diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile
index 26bb871..51d9e6e 100644
--- a/tools/firmware/vgabios/Makefile
+++ b/tools/firmware/vgabios/Makefile
@@ -25,6 +25,9 @@ clean:
           temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core 
vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
        rm -f VGABIOS-lgpl-latest*.bin
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: release
 release: 
        VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
diff --git a/tools/flask/Makefile b/tools/flask/Makefile
index bc77a06..a31cc16 100644
--- a/tools/flask/Makefile
+++ b/tools/flask/Makefile
@@ -4,6 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 SUBDIRS-y := utils
 SUBDIRS-$(FLASK_POLICY) += policy
 
-.PHONY: all clean install
-all clean install: %: subdirs-%
+.PHONY: all clean install distclean
+all clean install distclean: %: subdirs-%
 
diff --git a/tools/flask/policy/Makefile b/tools/flask/policy/Makefile
index 5d8cfbf..54a845b 100644
--- a/tools/flask/policy/Makefile
+++ b/tools/flask/policy/Makefile
@@ -115,4 +115,6 @@ policy.conf: $(POLICY_SECTIONS)
 clean:
        $(RM) tmp policy.conf $(POLICY_FILENAME)
 
-.PHONY: all install clean
+distclean: clean
+
+.PHONY: all install clean distclean
diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile
index c87f15c..5dfd271 100644
--- a/tools/flask/utils/Makefile
+++ b/tools/flask/utils/Makefile
@@ -39,6 +39,9 @@ clean:
        rm -f $(CLIENTS)
        $(RM) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: print-dir
 print-dir:
        @echo -n tools/flask/utils: 
diff --git a/tools/hotplug/FreeBSD/Makefile b/tools/hotplug/FreeBSD/Makefile
index 6aba64a..8dfc90a 100644
--- a/tools/hotplug/FreeBSD/Makefile
+++ b/tools/hotplug/FreeBSD/Makefile
@@ -40,3 +40,6 @@ install-rcd:
 
 .PHONY: clean
 clean:
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index b8490f9..d94a9cb 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -81,3 +81,6 @@ install-udev:
 
 .PHONY: clean
 clean: subdirs-clean
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/hotplug/Linux/systemd/Makefile 
b/tools/hotplug/Linux/systemd/Makefile
index 51c10fe..83e3b32 100644
--- a/tools/hotplug/Linux/systemd/Makefile
+++ b/tools/hotplug/Linux/systemd/Makefile
@@ -28,6 +28,9 @@ all:  $(ALL_XEN_SYSTEMD)
 clean:
        rm -f $(XEN_SYSTEMD_MODULES)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install: $(ALL_XEN_SYSTEMD)
        [ -d $(DESTDIR)$(XEN_SYSTEMD_DIR) ] || \
diff --git a/tools/hotplug/Makefile b/tools/hotplug/Makefile
index 14ae9a8..c1a82c1 100644
--- a/tools/hotplug/Makefile
+++ b/tools/hotplug/Makefile
@@ -6,5 +6,5 @@ SUBDIRS-$(CONFIG_NetBSD) += NetBSD
 SUBDIRS-$(CONFIG_Linux) += Linux
 SUBDIRS-$(CONFIG_FreeBSD) += FreeBSD
 
-.PHONY: all clean install
-all clean install: %: subdirs-%
+.PHONY: all clean install distclean
+all clean install distclean: %: subdirs-%
diff --git a/tools/hotplug/NetBSD/Makefile b/tools/hotplug/NetBSD/Makefile
index 0a370b8..4e609e3 100644
--- a/tools/hotplug/NetBSD/Makefile
+++ b/tools/hotplug/NetBSD/Makefile
@@ -42,3 +42,6 @@ install-rcd:
 
 .PHONY: clean
 clean:
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/hotplug/common/Makefile b/tools/hotplug/common/Makefile
index 5623abb..b53b55c 100644
--- a/tools/hotplug/common/Makefile
+++ b/tools/hotplug/common/Makefile
@@ -37,3 +37,6 @@ install-scripts: build
 .PHONY: clean
 clean:
        rm -f $(HOTPLUGPATH)
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/include/Makefile b/tools/include/Makefile
index f7a6256..601f79c 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -50,3 +50,6 @@ clean:
        rm -rf xen
        $(MAKE) -C xen-foreign clean
 
+
+.PHONY: distclean
+distclean: clean
diff --git a/tools/include/xen-foreign/Makefile 
b/tools/include/xen-foreign/Makefile
index 06b844c..ef8fc12 100644
--- a/tools/include/xen-foreign/Makefile
+++ b/tools/include/xen-foreign/Makefile
@@ -6,7 +6,7 @@ ROOT = $(XEN_ROOT)/xen/include/public
 architectures := arm32 arm64 x86_32 x86_64
 headers := $(patsubst %, %.h, $(architectures))
 
-.PHONY: all clean check-headers
+.PHONY: all clean distclean check-headers
 all: $(headers) check-headers
 
 clean:
@@ -14,6 +14,8 @@ clean:
        rm -f checker checker.c
        rm -f *.pyc *.o *~
 
+distclean: clean
+
 checker: checker.c $(headers)
        $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
 
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index bd2ca6c..7587d4c 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -170,6 +170,9 @@ clean:
             $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS) \
             $(OSDEP_LIB_OBJS) $(OSDEP_PIC_OBJS)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: rpm
 rpm: build
        rm -rf staging
diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile
index 2c34f96..ce86f20 100644
--- a/tools/memshr/Makefile
+++ b/tools/memshr/Makefile
@@ -39,6 +39,9 @@ install: all
 clean:
        rm -rf *.a *.o *~ $(DEPS)
 
-.PHONY: all build clean install
+.PHONY: distclean
+distclean: clean
+
+.PHONY: all build clean install distclean
 
 -include $(DEPS)
diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index a255c22..ccd36af 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -62,6 +62,9 @@ install: build
 clean:
        $(RM) *.o $(TARGETS_BUILD) *~ $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xen-hvmctx: xen-hvmctx.o
        $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
 
diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
index 5710a5f..cfa931a 100644
--- a/tools/ocaml/Makefile
+++ b/tools/ocaml/Makefile
@@ -20,3 +20,6 @@ install: subdirs-install
 
 .PHONY: clean
 clean: subdirs-clean
+
+.PHONY: distclean
+distclean: subdirs-distclean
diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules
index 0745e83..1796060 100644
--- a/tools/ocaml/Makefile.rules
+++ b/tools/ocaml/Makefile.rules
@@ -47,6 +47,8 @@ ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $(ALL_OCAML_OBJS))
 clean: $(CLEAN_HOOKS)
        $(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot 
*.spot *.spit $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make META
 
+distclean: clean
+
 quiet-command = $(if $(V),$1,@printf " %-8s %s\n" "$2" "$3" && $1)
 
 mk-caml-lib-native = $(call quiet-command, $(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o 
$1 $2 $3,MLA,$1)
diff --git a/tools/ocaml/libs/Makefile b/tools/ocaml/libs/Makefile
index 3afdc89..f7c3c0e 100644
--- a/tools/ocaml/libs/Makefile
+++ b/tools/ocaml/libs/Makefile
@@ -15,3 +15,6 @@ install: subdirs-install
 
 .PHONY: clean
 clean: subdirs-clean
+
+.PHONY: distclean
+distclean: subdirs-distclean
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 3dff608..6fd194c 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -23,4 +23,7 @@ install: all
 clean:
        rm -rf build tmp *.pyc *.pyo *.o *.a *~ a.out $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)
diff --git a/tools/python/Makefile b/tools/python/Makefile
index 533d3de..af95119 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -28,4 +28,7 @@ clean:
        rm -rf build/
        rm -f $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)
diff --git a/tools/tests/mce-test/Makefile b/tools/tests/mce-test/Makefile
index 7c80eb3..07a774a 100644
--- a/tools/tests/mce-test/Makefile
+++ b/tools/tests/mce-test/Makefile
@@ -1,7 +1,10 @@
-.PHONY: all clean
+.PHONY: all clean distclean
 
 all: 
        $(MAKE) -C tools
 
 clean:
        $(MAKE) -C tools clean
+
+distclean:
+       $(MAKE) -C tools distclean
diff --git a/tools/tests/mce-test/tools/Makefile 
b/tools/tests/mce-test/tools/Makefile
index aba7177..4a0db49 100644
--- a/tools/tests/mce-test/tools/Makefile
+++ b/tools/tests/mce-test/tools/Makefile
@@ -19,5 +19,8 @@ install: xen-mceinj
 clean:
        $(RM) *.o xen-mceinj
 
+.PHONY: distclean
+distclean: clean
+
 xen-mceinj: xen-mceinj.o Makefile
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) 
$(LDLIBS_libxenstore)
diff --git a/tools/tests/mem-sharing/Makefile b/tools/tests/mem-sharing/Makefile
index 1354502..d89e283 100644
--- a/tools/tests/mem-sharing/Makefile
+++ b/tools/tests/mem-sharing/Makefile
@@ -20,6 +20,9 @@ build: $(TARGETS)
 clean:
        $(RM) *.o $(TARGETS) *~ $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 memshrtool: memshrtool.o
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl)
 
diff --git a/tools/tests/regression/Makefile b/tools/tests/regression/Makefile
index 6e91023..70d524a 100644
--- a/tools/tests/regression/Makefile
+++ b/tools/tests/regression/Makefile
@@ -22,8 +22,8 @@ check-python-syntax: runtime-environment
 .PHONY: runtime-environment
 runtime-environment: $(PYTHON_VERSIONS)
 
-.PHONY: dist-clean
-dist-clean:
+.PHONY: distclean
+distclean:
        rm -fr $(REG_TEST_DIR)/installed $(REG_TEST_DIR)/downloads \
                $(REG_TEST_DIR)/build
 
diff --git a/tools/tests/vhpet/Makefile b/tools/tests/vhpet/Makefile
index 763409d..cb88dd0 100644
--- a/tools/tests/vhpet/Makefile
+++ b/tools/tests/vhpet/Makefile
@@ -26,6 +26,9 @@ $(TARGET): hpet.c main.c hpet.h emul.h Makefile
 clean:
        rm -rf $(TARGET) $(TARGET).out *.o *~ core* hpet.h hpet.c
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install:
 
diff --git a/tools/tests/x86_emulator/Makefile 
b/tools/tests/x86_emulator/Makefile
index 73517b7..b52f227 100644
--- a/tools/tests/x86_emulator/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -34,6 +34,9 @@ $(TARGET): x86_emulate.o test_x86_emulator.o
 clean:
        rm -rf $(TARGET) *.o *~ core blowfish.h blowfish.bin x86_emulate
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: install
 install:
 
diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile
index 65eef99..f0e94fd 100644
--- a/tools/tests/xen-access/Makefile
+++ b/tools/tests/xen-access/Makefile
@@ -21,6 +21,9 @@ build: $(TARGETS)
 clean:
        $(RM) *.o $(TARGETS) *~ $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xen-access: xen-access.o Makefile
        $(CC) -o $@ $< $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
 
diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 1c5237c..fff519d 100644
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -42,4 +42,7 @@ clean:
        $(RM) *.o $(PROGRAMS)
        $(RM) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)
diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile
index 31e5c62..b6bc160 100644
--- a/tools/xenbackendd/Makefile
+++ b/tools/xenbackendd/Makefile
@@ -32,6 +32,9 @@ install: build
 clean:
        $(RM) *.a *.so *.o $(DEPS) xenbackendd
 
+.PHONY: distclean
+distclean: clean
+
 xenbackendd: xenbackendd.o
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 
diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index 3fe87ba..c206d94 100644
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -40,6 +40,9 @@ clean:
        $(RM) -f xenbaked xenbaked.o
        $(RM) -f xentrace_setmask setmask.o
 
+.PHONY: distclean
+distclean: clean
+
 xenbaked: xenbaked.o Makefile
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 
diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
index c742e62..2407a30 100644
--- a/tools/xenpaging/Makefile
+++ b/tools/xenpaging/Makefile
@@ -31,7 +31,9 @@ install: all
 clean:
        rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)
 
-.PHONY: clean install
+distclean: clean
+
+.PHONY: clean install distclean
 
 .PHONY: TAGS
 TAGS:
diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
index 2d925df..4605261 100644
--- a/tools/xenpmd/Makefile
+++ b/tools/xenpmd/Makefile
@@ -18,6 +18,9 @@ install: all
 clean:
        $(RM) -f xenpmd xenpmd.o $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xenpmd: xenpmd.o Makefile
        $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS)
 
diff --git a/tools/xenstat/Makefile b/tools/xenstat/Makefile
index 904ccdd..901be4a 100644
--- a/tools/xenstat/Makefile
+++ b/tools/xenstat/Makefile
@@ -11,6 +11,6 @@ SUBDIRS += xentop
 endif
 endif
 
-.PHONY: all install clean
+.PHONY: all install clean distclean
 
-all install clean: %: subdirs-%
+all install clean distclean: %: subdirs-%
diff --git a/tools/xenstat/libxenstat/Makefile 
b/tools/xenstat/libxenstat/Makefile
index 86068cb..07d39b1 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -137,4 +137,7 @@ clean:
        rm -f $(LIB) $(SHLIB) $(SHLIB_LINKS) $(OBJECTS-y) \
              $(BINDINGS) $(BINDINGSRC) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)
diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 076e44c..e2665aa 100644
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -42,4 +42,7 @@ endif
 clean:
        rm -f xentop xentop.o $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 -include $(DEPS)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 11b6a06..60c3a08 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -115,6 +115,9 @@ clean:
        rm -f xenstore $(CLIENTS)
        $(RM) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 .PHONY: TAGS
 TAGS:
        etags `find . -name '*.[ch]'`
diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index b821952..a64db86 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -34,6 +34,9 @@ install: build
 clean:
        $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN) $(DEPS)
 
+.PHONY: distclean
+distclean: clean
+
 xentrace: xentrace.o
        $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS) $(APPEND_LDFLAGS)
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.