summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-10 01:31:47 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-02-10 01:31:47 +0100
commit0c07a86b3442492cc21caa3d52eac67141568c4f (patch)
treec2a45c5487a563087ec73d6a3ede3bb11601564b
parentd54e62e605fe1ae4511d6dbf5913b73ba7c615a7 (diff)
downloadmediapointer-dvb-s2-0c07a86b3442492cc21caa3d52eac67141568c4f.tar.gz
mediapointer-dvb-s2-0c07a86b3442492cc21caa3d52eac67141568c4f.tar.bz2
v4l-dvb: fix distclean/clean targets
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-rw-r--r--Makefile10
-rw-r--r--v4l/Makefile15
2 files changed, 13 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 20e4e8fb8..a1e609f0e 100644
--- a/Makefile
+++ b/Makefile
@@ -21,16 +21,6 @@ install:
commit cvscommit hgcommit change changes changelog:: whitespace
@cd $(BUILD_DIR); scripts/cardlist; scripts/do_commit.sh $(EDITOR) $(TMP)/v4l_hg_whitespace; cd ..
-spec:
- $(MAKE) -C v4l2-spec
-
-apps:
- $(MAKE) -C v4l2-apps
-
-distclean clean::
- $(MAKE) -C v4l2-spec $@
- $(MAKE) -C v4l2-apps $@
-
qrefresh: Q=q
qrefresh:: whitespace
cd $(BUILD_DIR); scripts/cardlist; cd ..
diff --git a/v4l/Makefile b/v4l/Makefile
index 52ca3ec54..da51bb50a 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -48,6 +48,12 @@ default:: config-compat.h Makefile.media links oss
firmware::
$(MAKE) -C firmware
+spec::
+ $(MAKE) -C ../v4l2-spec
+
+apps::
+ $(MAKE) -C ../v4l2-apps
+
#################################################
# Object specific rules
@@ -265,6 +271,7 @@ config-compat.h:: $(obj)/.version .myconfig scripts/make_config_compat.pl
kernel-links makelinks::
cd ..; v4l/scripts/makelinks.sh $(SRCDIR)
+
#################################################
# Cardlist updating rule
@@ -279,7 +286,9 @@ clean::
@find . -name '*.h' -type l -exec rm '{}' \;
-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \
config-compat.h Module.symvers Module.markers modules.order
- make -C firmware clean
+ $(MAKE) -C firmware $@
+ $(MAKE) -C ../v4l2-spec $@
+ $(MAKE) -C ../v4l2-apps $@
distclean:: clean
-rm -f .version .*.o.flags .*.o.d Makefile.media \
@@ -289,7 +298,9 @@ distclean:: clean
-rm -f scripts/lxdialog scripts/kconfig oss
@find .. -name '*.orig' -exec rm '{}' \;
@find .. -name '*.rej' -exec rm '{}' \;
- $(MAKE) -C firmware distclean
+ $(MAKE) -C firmware $@
+ $(MAKE) -C ../v4l2-spec $@
+ $(MAKE) -C ../v4l2-apps $@
#################################################
# Kernel module insert/removal rules