1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00

Make distclean target more failure proof.

Audacity tries to run clean/distclean on subdirectories speculatively
and ignores errors of the clean/distclean call in subdirectories.
clean/distclean should only be run for subdirectories if they contain
a Makefile.
This commit is contained in:
benjamin.drung@gmail.com 2013-10-24 00:19:11 +00:00
parent 7bb67e33fd
commit e233f13c94
2 changed files with 46 additions and 46 deletions

View File

@ -150,7 +150,7 @@ dep:
clean: clean:
$(MAKE) -C lib-src clean $(MAKE) -C lib-src clean
$(MAKE) -C src clean $(MAKE) -C src clean
-$(MAKE) -C tests clean test ! -f tests/Makefile || $(MAKE) -C tests clean
rm -f audacity rm -f audacity
rm -f help/audacity.1.gz rm -f help/audacity.1.gz
rm -rf Audacity.app rm -rf Audacity.app
@ -165,7 +165,7 @@ veryclean: clean
distclean: clean distclean: clean
$(MAKE) -C locale distclean $(MAKE) -C locale distclean
$(MAKE) -C lib-src distclean $(MAKE) -C lib-src distclean
-$(MAKE) -C tests distclean test ! -f tests/Makefile || $(MAKE) -C tests distclean
rm -f Makefile src/Makefile lib-src/Makefile rm -f Makefile src/Makefile lib-src/Makefile
rm -f locale/Makefile src/configunix.h rm -f locale/Makefile src/configunix.h

View File

@ -150,52 +150,52 @@ libportmixer.a: portmixer-recursive
# Utility rules # Utility rules
clean: clean:
-$(MAKE) -C portsmf clean test ! -f portsmf/Makefile || $(MAKE) -C portsmf clean
-$(MAKE) -C expat clean test ! -f expat/Makefile || $(MAKE) -C expat clean
-$(MAKE) -C FileDialog clean test ! -f FileDialog/Makefile || $(MAKE) -C FileDialog clean
-$(MAKE) -C libid3tag clean test ! -f libid3tag/Makefile || $(MAKE) -C libid3tag clean
-$(MAKE) -C libmad clean test ! -f libmad/Makefile || $(MAKE) -C libmad clean
-$(MAKE) -C libnyquist clean test ! -f libnyquist/Makefile || $(MAKE) -C libnyquist clean
-$(MAKE) -C liblrdf clean test ! -f liblrdf/Makefile || $(MAKE) -C liblrdf clean
-$(MAKE) -C libogg clean test ! -f libogg/Makefile || $(MAKE) -C libogg clean
-$(MAKE) -C libsoxr clean test ! -f libsoxr/Makefile || $(MAKE) -C libsoxr clean
-$(MAKE) -C libsamplerate clean test ! -f libsamplerate/Makefile || $(MAKE) -C libsamplerate clean
-$(MAKE) -C libresample clean test ! -f libresample/Makefile || $(MAKE) -C libresample clean
-$(MAKE) -C libsndfile clean test ! -f libsndfile/Makefile || $(MAKE) -C libsndfile clean
-$(MAKE) -C libvamp clean test ! -f libvamp/Makefile || $(MAKE) -C libvamp clean
-$(MAKE) -C libvorbis clean test ! -f libvorbis/Makefile || $(MAKE) -C libvorbis clean
-$(MAKE) -C lib-widget-extra clean test ! -f lib-widget-extra/Makefile || $(MAKE) -C lib-widget-extra clean
-$(MAKE) -C libflac clean test ! -f libflac/Makefile || $(MAKE) -C libflac clean
-$(MAKE) -C portaudio-v19 clean test ! -f portaudio-v19/Makefile || $(MAKE) -C portaudio-v19 clean
-$(MAKE) -C portmixer clean test ! -f portmixer/Makefile || $(MAKE) -C portmixer clean
-$(MAKE) -C sbsms clean test ! -f sbsms/Makefile || $(MAKE) -C sbsms clean
-$(MAKE) -C soundtouch clean test ! -f soundtouch/Makefile || $(MAKE) -C soundtouch clean
-$(MAKE) -C twolame clean test ! -f twolame/Makefile || $(MAKE) -C twolame clean
-rm -rf @LOCAL_LIBS@ rm -f @LOCAL_LIBS@
distclean: distclean:
-$(MAKE) -C portsmf distclean test ! -f portsmf/Makefile || $(MAKE) -C portsmf distclean
-$(MAKE) -C expat distclean test ! -f expat/Makefile || $(MAKE) -C expat distclean
-$(MAKE) -C FileDialog distclean test ! -f FileDialog/Makefile || $(MAKE) -C FileDialog distclean
-$(MAKE) -C libid3tag distclean test ! -f libid3tag/Makefile || $(MAKE) -C libid3tag distclean
-$(MAKE) -C libmad distclean test ! -f libmad/Makefile || $(MAKE) -C libmad distclean
-$(MAKE) -C libnyquist distclean test ! -f libnyquist/Makefile || $(MAKE) -C libnyquist distclean
-$(MAKE) -C liblrdf distclean test ! -f liblrdf/Makefile || $(MAKE) -C liblrdf distclean
-$(MAKE) -C libogg distclean test ! -f libogg/Makefile || $(MAKE) -C libogg distclean
-$(MAKE) -C libsoxr distclean test ! -f libsoxr/Makefile || $(MAKE) -C libsoxr distclean
-$(MAKE) -C libsamplerate distclean test ! -f libsamplerate/Makefile || $(MAKE) -C libsamplerate distclean
-$(MAKE) -C libresample distclean test ! -f libresample/Makefile || $(MAKE) -C libresample distclean
-$(MAKE) -C libsndfile distclean test ! -f libsndfile/Makefile || $(MAKE) -C libsndfile distclean
-$(MAKE) -C libvamp distclean test ! -f libvamp/Makefile || $(MAKE) -C libvamp distclean
-$(MAKE) -C libvorbis distclean test ! -f libvorbis/Makefile || $(MAKE) -C libvorbis distclean
-$(MAKE) -C lib-widget-extra distclean test ! -f lib-widget-extra/Makefile || $(MAKE) -C lib-widget-extra distclean
-$(MAKE) -C libflac distclean test ! -f libflac/Makefile || $(MAKE) -C libflac distclean
-$(MAKE) -C portaudio-v19 distclean test ! -f portaudio-v19/Makefile || $(MAKE) -C portaudio-v19 distclean
-$(MAKE) -C portmixer distclean test ! -f portmixer/Makefile || $(MAKE) -C portmixer distclean
-$(MAKE) -C sbsms distclean test ! -f sbsms/Makefile || $(MAKE) -C sbsms distclean
-$(MAKE) -C soundtouch distclean test ! -f soundtouch/Makefile || $(MAKE) -C soundtouch distclean
-$(MAKE) -C twolame distclean test ! -f twolame/Makefile || $(MAKE) -C twolame distclean
-rm -f @LOCAL_LIBS@ rm -f @LOCAL_LIBS@
# list here all the targets that aren't actually files to be made # list here all the targets that aren't actually files to be made
.PHONY: portsmf-recursive eexpat-recursive FileDialog-recursive \ .PHONY: portsmf-recursive eexpat-recursive FileDialog-recursive \