v4l2-apps: fix the distclean makerules

From: Hans Verkuil <hverkuil@xs4all.nl>

Pass the distclean target on to qv4l2 for proper cleanup.

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/Makefile b/Makefile
index 86b5bc2..6707ff6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,9 @@ all clean install::
 %:
        make -C .. $(MAKECMDGOALS)
 
-clean::
-       -$(RM) -rf include
-
 distclean:: clean
+       $(MAKE) -C util $@
+       -$(RM) -rf include
 
 prepare-includes:
        -if [ ! -d include ]; then \

diff --git a/utils/Makefile b/utils/Makefile
index 980002d..a429267 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -34,18 +34,20 @@ ifeq ($(prefix),)
 prefix = /usr
 endif
 
-.PHONY: all clean install qv4l2
+.PHONY: all distclean clean install qv4l2
 
 all: $(binaries) qv4l2 keytable
 
 clean::
        rm -f $(binaries) v4l2-chipids.cpp
-       -if [ -f qv4l2/Makefile ]; then make -C qv4l2 $@; fi
-       -rm -f qv4l2/qv4l2 qv4l2/Makefile
+       if [ -f qv4l2/Makefile ]; then make -C qv4l2 $@; fi
        make -C xc3028-firmware $@
        rm -f v4l2-chipids.cpp
        rm -rf keycodes parse.h keytable
 
+distclean:: clean
+       if [ -f qv4l2/Makefile ]; then make -C qv4l2 $@; rm qv4l2/Makefile; fi
+
 # Test whether qmake is installed, and whether it is for qt3.
 qv4l2:
        @-if which qmake >/dev/null 2>&1; then \