| Message ID | 20190911162900.8498-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Makefile: Remove generated files when doing 'distclean' | expand |
On 9/11/19 12:29 PM, Thomas Huth wrote: > When running "make distclean" we currently leave a lot of generated > files in the build directory. Fix that. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Nice, Reviewed-by: John Snow <jsnow@redhat.com> > --- > Makefile | 6 +++--- > tests/Makefile.include | 12 +++++++++++- > 2 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > index ae17a83067..67e7e40e8c 100644 > --- a/Makefile > +++ b/Makefile > @@ -681,14 +681,14 @@ clean: recurse-clean > -exec rm {} + > rm -f $(edk2-decompressed) > rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~ > - rm -f fsdev/*.pod scsi/*.pod > + rm -f fsdev/*.pod scsi/*.pod docs/*.pod docs/*/*.pod docs/*/.buildinfo > rm -f qemu-img-cmds.h > rm -f ui/shader/*-vert.h ui/shader/*-frag.h > @# May not be present in generated-files-y > rm -f trace/generated-tracers-dtrace.dtrace* > rm -f trace/generated-tracers-dtrace.h* > rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) > - rm -f qapi-gen-timestamp > + rm -f qapi-gen-timestamp vhost-user-input > rm -rf qga/qapi-generated > rm -f config-all-devices.mak > > @@ -719,7 +719,7 @@ distclean: clean > rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi > rm -f config-all-devices.mak config-all-disas.mak config.status > rm -f $(SUBDIR_DEVICES_MAK) > - rm -f po/*.mo tests/qemu-iotests/common.env > + rm -f po/*.mo > rm -f roms/seabios/config.mak roms/vgabios/config.mak > rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps > rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys > diff --git a/tests/Makefile.include b/tests/Makefile.include > index f5ac09549c..07f794b01f 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -1174,11 +1174,21 @@ check: check-block check-qapi-schema check-unit check-softfloat check-qtest chec > check-clean: > rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) > rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) > - rm -f tests/test-qapi-gen-timestamp > rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) > + rm -f tests/qemu-iotests/common.env tests/qemu-iotests/check.* > + rm -f tests/test-qapi-gen-timestamp tests/qht-bench$(EXESUF) \ > + tests/fp/fp-test tests/fp/*.out tests/qapi-schema/*.test.* > > clean: check-clean > > +check-distclean: > + rm -f tests/test-qapi-types*.c tests/test-qapi-visit*.c \ > + tests/test-qapi-commands*.c tests/test-qapi-events*.c \ > + tests/test-qapi-emit-events.[ch] tests/test-qapi-introspect.c \ > + tests/include/test-qapi-*.c > + > +distclean: check-distclean > + > # Build the help program automatically > > all: $(QEMU_IOTESTS_HELPERS-y) >
On 11/09/19 18:29, Thomas Huth wrote: > When running "make distclean" we currently leave a lot of generated > files in the build directory. Fix that. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > Makefile | 6 +++--- > tests/Makefile.include | 12 +++++++++++- > 2 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > index ae17a83067..67e7e40e8c 100644 > --- a/Makefile > +++ b/Makefile > @@ -681,14 +681,14 @@ clean: recurse-clean > -exec rm {} + > rm -f $(edk2-decompressed) > rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~ > - rm -f fsdev/*.pod scsi/*.pod > + rm -f fsdev/*.pod scsi/*.pod docs/*.pod docs/*/*.pod docs/*/.buildinfo > rm -f qemu-img-cmds.h > rm -f ui/shader/*-vert.h ui/shader/*-frag.h > @# May not be present in generated-files-y > rm -f trace/generated-tracers-dtrace.dtrace* > rm -f trace/generated-tracers-dtrace.h* > rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) > - rm -f qapi-gen-timestamp > + rm -f qapi-gen-timestamp vhost-user-input > rm -rf qga/qapi-generated > rm -f config-all-devices.mak > > @@ -719,7 +719,7 @@ distclean: clean > rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi > rm -f config-all-devices.mak config-all-disas.mak config.status > rm -f $(SUBDIR_DEVICES_MAK) > - rm -f po/*.mo tests/qemu-iotests/common.env > + rm -f po/*.mo > rm -f roms/seabios/config.mak roms/vgabios/config.mak > rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps > rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys > diff --git a/tests/Makefile.include b/tests/Makefile.include > index f5ac09549c..07f794b01f 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -1174,11 +1174,21 @@ check: check-block check-qapi-schema check-unit check-softfloat check-qtest chec > check-clean: > rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) > rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) > - rm -f tests/test-qapi-gen-timestamp > rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) > + rm -f tests/qemu-iotests/common.env tests/qemu-iotests/check.* > + rm -f tests/test-qapi-gen-timestamp tests/qht-bench$(EXESUF) \ > + tests/fp/fp-test tests/fp/*.out tests/qapi-schema/*.test.* > > clean: check-clean > > +check-distclean: > + rm -f tests/test-qapi-types*.c tests/test-qapi-visit*.c \ > + tests/test-qapi-commands*.c tests/test-qapi-events*.c \ > + tests/test-qapi-emit-events.[ch] tests/test-qapi-introspect.c \ > + tests/include/test-qapi-*.c > + > +distclean: check-distclean > + > # Build the help program automatically > > all: $(QEMU_IOTESTS_HELPERS-y) > Queued, thanks. Paolo
diff --git a/Makefile b/Makefile index ae17a83067..67e7e40e8c 100644 --- a/Makefile +++ b/Makefile @@ -681,14 +681,14 @@ clean: recurse-clean -exec rm {} + rm -f $(edk2-decompressed) rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~ - rm -f fsdev/*.pod scsi/*.pod + rm -f fsdev/*.pod scsi/*.pod docs/*.pod docs/*/*.pod docs/*/.buildinfo rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h @# May not be present in generated-files-y rm -f trace/generated-tracers-dtrace.dtrace* rm -f trace/generated-tracers-dtrace.h* rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) - rm -f qapi-gen-timestamp + rm -f qapi-gen-timestamp vhost-user-input rm -rf qga/qapi-generated rm -f config-all-devices.mak @@ -719,7 +719,7 @@ distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi rm -f config-all-devices.mak config-all-disas.mak config.status rm -f $(SUBDIR_DEVICES_MAK) - rm -f po/*.mo tests/qemu-iotests/common.env + rm -f po/*.mo rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys diff --git a/tests/Makefile.include b/tests/Makefile.include index f5ac09549c..07f794b01f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1174,11 +1174,21 @@ check: check-block check-qapi-schema check-unit check-softfloat check-qtest chec check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y)) - rm -f tests/test-qapi-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) + rm -f tests/qemu-iotests/common.env tests/qemu-iotests/check.* + rm -f tests/test-qapi-gen-timestamp tests/qht-bench$(EXESUF) \ + tests/fp/fp-test tests/fp/*.out tests/qapi-schema/*.test.* clean: check-clean +check-distclean: + rm -f tests/test-qapi-types*.c tests/test-qapi-visit*.c \ + tests/test-qapi-commands*.c tests/test-qapi-events*.c \ + tests/test-qapi-emit-events.[ch] tests/test-qapi-introspect.c \ + tests/include/test-qapi-*.c + +distclean: check-distclean + # Build the help program automatically all: $(QEMU_IOTESTS_HELPERS-y)
When running "make distclean" we currently leave a lot of generated files in the build directory. Fix that. Signed-off-by: Thomas Huth <thuth@redhat.com> --- Makefile | 6 +++--- tests/Makefile.include | 12 +++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-)