| Message ID | 1340211753-17326-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | b54fa7ddde8ace758d1eb332ce4a10e35dbf7302 |
| Headers | show |
This is v2, obviously -- I forgot to change the [PATCH] prefix :-( -- PMM On 20 June 2012 18:02, Peter Maydell <peter.maydell@linaro.org> wrote: > Now we create object files in a hierarchy under hw/, so the > 'clean' target must also be updated to delete those object files. > Rather than using a manual list of subdirectories which will > easily drift out of date, we just delete all .o and .d files > in the target directory hierarchy. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > v1->v2: fixed missing "-f" option to rm, fixed grammar flub > in commit message. > > Makefile.target | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.target b/Makefile.target > index 550d889..6d60050 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -193,8 +193,8 @@ qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") > > clean: > - rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o > - rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o kvm/*.o > + rm -f *.a *~ $(PROGS) > + rm -f $(shell find . -name '*.[od]') > rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c > ifdef CONFIG_TRACE_SYSTEMTAP > rm -f *.stp > -- > 1.7.1
On 06/20/2012 12:02 PM, Peter Maydell wrote: > Now we create object files in a hierarchy under hw/, so the > 'clean' target must also be updated to delete those object files. > Rather than using a manual list of subdirectories which will > easily drift out of date, we just delete all .o and .d files > in the target directory hierarchy. > > Signed-off-by: Peter Maydell<peter.maydell@linaro.org> Applied. Thanks. Regards, Anthony Liguori > --- > v1->v2: fixed missing "-f" option to rm, fixed grammar flub > in commit message. > > Makefile.target | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.target b/Makefile.target > index 550d889..6d60050 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -193,8 +193,8 @@ qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h< $< > $@," GEN $(TARGET_DIR)$@") > > clean: > - rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o > - rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o kvm/*.o > + rm -f *.a *~ $(PROGS) > + rm -f $(shell find . -name '*.[od]') > rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c > ifdef CONFIG_TRACE_SYSTEMTAP > rm -f *.stp
diff --git a/Makefile.target b/Makefile.target index 550d889..6d60050 100644 --- a/Makefile.target +++ b/Makefile.target @@ -193,8 +193,8 @@ qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") clean: - rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o - rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o kvm/*.o + rm -f *.a *~ $(PROGS) + rm -f $(shell find . -name '*.[od]') rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c ifdef CONFIG_TRACE_SYSTEMTAP rm -f *.stp
Now we create object files in a hierarchy under hw/, so the 'clean' target must also be updated to delete those object files. Rather than using a manual list of subdirectories which will easily drift out of date, we just delete all .o and .d files in the target directory hierarchy. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- v1->v2: fixed missing "-f" option to rm, fixed grammar flub in commit message. Makefile.target | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)