Patchwork Makefile: drop recursive libcacard clean

login
register
mail settings
Submitter Stefan Hajnoczi
Date Jan. 15, 2013, 7:47 a.m.
Message ID <1358236046-17242-1-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/212006/
State New
Headers show

Comments

Stefan Hajnoczi - Jan. 15, 2013, 7:47 a.m.
Commit eb8eb53e5846a957cf333f2e1ec8cb6e0c04 ("libcacard: rewrite
Makefile in non-recursive style") refactored libcacard/Makefile so it
can be included by the top-level Makefile.

The top-level clean target still loops over subdirectories, including
libcacard/, to invoke recursive clean.  Remove libcacard from the
recursive clean since its files are already included at the top level.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Stefan Hajnoczi - Jan. 17, 2013, 10:26 a.m.
On Tue, Jan 15, 2013 at 08:47:26AM +0100, Stefan Hajnoczi wrote:
> Commit eb8eb53e5846a957cf333f2e1ec8cb6e0c04 ("libcacard: rewrite
> Makefile in non-recursive style") refactored libcacard/Makefile so it
> can be included by the top-level Makefile.
> 
> The top-level clean target still loops over subdirectories, including
> libcacard/, to invoke recursive clean.  Remove libcacard from the
> recursive clean since its files are already included at the top level.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 7622a4c..0ecfcda 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -226,7 +226,7 @@ clean:
>  	rm -rf qapi-generated
>  	rm -rf qga/qapi-generated
>  	$(MAKE) -C tests/tcg clean
> -	for d in $(ALL_SUBDIRS) libcacard; do \
> +	for d in $(ALL_SUBDIRS); do \
>  	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
>  	rm -f $$d/qemu-options.def; \
>          done

Ping.  Please apply so that make clean succeeds.

Stefan
Anthony Liguori - Jan. 20, 2013, 8:53 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/Makefile b/Makefile
index 7622a4c..0ecfcda 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,7 @@  clean:
 	rm -rf qapi-generated
 	rm -rf qga/qapi-generated
 	$(MAKE) -C tests/tcg clean
-	for d in $(ALL_SUBDIRS) libcacard; do \
+	for d in $(ALL_SUBDIRS); do \
 	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
 	rm -f $$d/qemu-options.def; \
         done