allow separate [v4l,dvb]-install; fix install for saa7146

        - fix install for saa7146.
        - allow separate, 'make v4l-install' and 'make dvb-install'
          'make install' does both.
        - 'make clean' and 'make distclean' less verbose.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>

2 files changed, 54 insertions, 39 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 43f531ad0..6ea31ddd8 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-27 15:02  mkrufky
+
+	* ../v4l/Makefile:
+	- fix install for saa7146.
+	- allow separate, 'make v4l-install' and 'make dvb-install'
+	  'make install' does both.
+	- 'make clean' and 'make distclean' less verbose.
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-11-27 12:33  hverkuil
 
 	* ../linux/drivers/media/video/saa7115.c: (saa7115_log_status):
diff --git a/v4l/Makefile b/v4l/Makefile
index c054ac6d9..ce7b68e6a 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -245,9 +245,7 @@ inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko
 inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko 
 inst_frontends += l64781.ko s5h1420.ko tda10021.o
 inst_dvb-core := dvb-core.ko
-ifeq ($(CONFIG_VIDEO_SAA7146),m)
- inst_common += saa7146.ko saa7146_vv.ko
-endif
+inst_saa7146 := saa7146.ko saa7146_vv.ko
 inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko
 inst_cinergyT2 := cinergyT2.ko
 inst_dvb-usb := dvb-usb.ko dvb-usb-vp7045.ko dvb-usb-vp702x.ko
@@ -276,7 +274,12 @@ links::
 
 #	@find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \;
 
-install:: rminstall dvb-install
+kernel-links::
+	cd ..;	v4l/scripts/makelinks.sh $(KDIR)
+
+install:: v4l-install dvb-install
+
+v4l-install:: v4l-rminstall
 	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
 
 	@strip --strip-debug $(inst-m)
@@ -301,24 +304,14 @@ install:: rminstall dvb-install
 
 	/sbin/depmod -a
 
-v4l_install:: rminstall
-	@echo -e "\nInstalling new V4L modules at $(DEST)..."
-
-	@strip --strip-debug $(inst-m)
-
-	-install -d $(DEST)
-	-install -m 644 -c $(inst-m) $(DEST)
-
-	/sbin/depmod -a
-
-kernel-links::
-	cd ..;	v4l/scripts/makelinks.sh $(KDIR)
-
 dvb-install:: dvb-rminstall
 	@echo -e "\nInstalling new DVB modules at corresponding Kernel dir..."
 
 	@strip --strip-debug $(inst-m)
 
+	-install -d $(KDIR26)/common
+	-install -m 644 -c $(inst_saa7146) $(KDIR26)/common
+
 	-install -d $(KDIR26)/dvb/frontends
 	-install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
 
@@ -351,6 +344,36 @@ dvb-install:: dvb-rminstall
 
 	/sbin/depmod -a
 
+old_install:: rminstall
+	@echo -e "\nInstalling new V4L modules at $(DEST)..."
+
+	@strip --strip-debug $(inst-m)
+
+	-install -d $(DEST)
+	-install -m 644 -c $(inst-m) $(DEST)
+
+	/sbin/depmod -a
+
+rminstall:: v4l-rminstall dvb-rminstall
+
+v4l-rminstall::
+	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
+
+	-@rm -r $(DEST) \
+		$(addprefix $(KDIR26)/common/, $(inst_common)) \
+		$(addprefix $(KDIR26)/video/, $(inst_video)) \
+		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
+		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
+		$(addprefix $(KDIR26)/video/em28xx/, $(inst_em28xx)) \
+		$(addprefix $(KDIRUSB)/, $(inst_em28xx)) \
+		$(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \
+		$(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \
+		$(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \
+		$(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \
+		$(addprefix $(KDIR26)/video/em28xx/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null \
+		$(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null
+	@echo
+
 dvb-rminstall::
 	@echo -e "\nEliminating old DVB modules (errors on this step is not a problem).."
 
@@ -377,37 +400,19 @@ dvb-rminstall::
 		$(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null
 	@echo
 
-rminstall:: dvb-rminstall
-	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
-
-	-@rm -r $(DEST) \
-		$(addprefix $(KDIR26)/common/, $(inst_common)) \
-		$(addprefix $(KDIR26)/video/, $(inst_video)) \
-		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
-		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
-		$(addprefix $(KDIR26)/video/em28xx/, $(inst_em28xx)) \
-		$(addprefix $(KDIRUSB)/, $(inst_em28xx)) \
-		$(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \
-		$(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \
-		$(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \
-		$(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null \
-		$(addprefix $(KDIR26)/video/em28xx/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null \
-		$(addprefix $(KDIRUSB)/, $(addsuffix .gz,$(inst_em28xx))) 2>/dev/null
-	@echo
-
 rmmodules::
 	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
 
 clean::
-	find . -name '*.c' -type l -exec rm '{}' \;
-	find . -name '*.h' -type l -exec rm '{}' \;
+	@find . -name '*.c' -type l -exec rm '{}' \;
+	@find . -name '*.h' -type l -exec rm '{}' \;
 	-rm -f *~ *.o *.ko *.mod.c
 
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
 	-rm -rf .tmp_versions
-	find .. -name '*.orig' -exec rm '{}' \;
-	find .. -name '*.rej' -exec rm '{}' \;
+	@find .. -name '*.orig' -exec rm '{}' \;
+	@find .. -name '*.rej' -exec rm '{}' \;
 
 change changes changelog::
 	make -C .. changelog