10 files changed, 23 insertions, 40 deletions
diff --git a/linux/drivers/media/dvb/b2c2/Makefile b/linux/drivers/media/dvb/b2c2/Makefile
index d288a67fb..a342c1e7d 100644
--- a/linux/drivers/media/dvb/b2c2/Makefile
+++ b/linux/drivers/media/dvb/b2c2/Makefile
@@ -13,4 +13,4 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
 b2c2-flexcop-usb-objs = flexcop-usb.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/linux/drivers/media/dvb/bt8xx/Makefile b/linux/drivers/media/dvb/bt8xx/Makefile
index 9d197efb4..84cf70504 100644
--- a/linux/drivers/media/dvb/bt8xx/Makefile
+++ b/linux/drivers/media/dvb/bt8xx/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video/bt8xx -Idrivers/media/dvb/frontends
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video/bt8xx -Idrivers/media/dvb/frontends
diff --git a/linux/drivers/media/dvb/cinergyT2/Makefile b/linux/drivers/media/dvb/cinergyT2/Makefile
index c51aece20..d762d8cb0 100644
--- a/linux/drivers/media/dvb/cinergyT2/Makefile
+++ b/linux/drivers/media/dvb/cinergyT2/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_CINERGYT2) += cinergyT2.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
diff --git a/linux/drivers/media/dvb/dvb-usb/Makefile b/linux/drivers/media/dvb/dvb-usb/Makefile
index 6e0a9c0f3..73ac0a93f 100644
--- a/linux/drivers/media/dvb/dvb-usb/Makefile
+++ b/linux/drivers/media/dvb/dvb-usb/Makefile
@@ -61,4 +61,4 @@ obj-$(CONFIG_DVB_USB_AF9005) += dvb-usb-af9005.o
 dvb-usb-af9005-remote-objs = af9005-remote.o
 obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/linux/drivers/media/dvb/frontends/Makefile b/linux/drivers/media/dvb/frontends/Makefile
index 27f386585..156b062e0 100644
--- a/linux/drivers/media/dvb/frontends/Makefile
+++ b/linux/drivers/media/dvb/frontends/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel DVB frontend device drivers.
 #
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
 
 obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
diff --git a/linux/drivers/media/dvb/pluto2/Makefile b/linux/drivers/media/dvb/pluto2/Makefile
index ce6a9aaf9..7ac128724 100644
--- a/linux/drivers/media/dvb/pluto2/Makefile
+++ b/linux/drivers/media/dvb/pluto2/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
diff --git a/linux/drivers/media/dvb/ttpci/Makefile b/linux/drivers/media/dvb/ttpci/Makefile
index aa85ecdc6..2c1145236 100644
--- a/linux/drivers/media/dvb/ttpci/Makefile
+++ b/linux/drivers/media/dvb/ttpci/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o budget-ci.o ttpci-eeprom.o
 obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o budget-patch.o ttpci-eeprom.o
 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o ttpci-eeprom.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 
 hostprogs-y	:= fdump
 
diff --git a/linux/drivers/media/dvb/ttusb-budget/Makefile b/linux/drivers/media/dvb/ttusb-budget/Makefile
index 6ab97f6b5..fbe2b9514 100644
--- a/linux/drivers/media/dvb/ttusb-budget/Makefile
+++ b/linux/drivers/media/dvb/ttusb-budget/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
diff --git a/linux/drivers/media/dvb/ttusb-dec/Makefile b/linux/drivers/media/dvb/ttusb-dec/Makefile
index b41bf1f06..2d70a8269 100644
--- a/linux/drivers/media/dvb/ttusb-dec/Makefile
+++ b/linux/drivers/media/dvb/ttusb-dec/Makefile
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh
index 9ee780aba..ee83e33ec 100755
--- a/v4l/scripts/makelinks.sh
+++ b/v4l/scripts/makelinks.sh
@@ -12,39 +12,22 @@ echo "patching $1..."
 
 cd linux
 PWD=`pwd`
+FINDDIR="-name CVS -prune -o -type d"
+FINDFILE="-name CVS -prune -o -type f -not -name .cvsignore\
+	-not -name '*.rej' -not -name '*.orig'"
 
-for x in `find drivers -type d | grep -v CVS` ; do
-	mkdir -p -v $1/$x
+for dir in drivers include Documentation; do
+	find $dir $FINDDIR -exec mkdir -p -v $1/{} \;
+	find $dir $FINDFILE -exec ln -f -s $PWD/{} $1/{} \;
 done
 
-for x in `find Documentation -type d | grep -v CVS` ; do
-	mkdir -p -v $1/$x
+for dir in drivers/media include; do
+	find $dir $FINDDIR -exec ln -f -s $PWD/../v4l/compat.h $1/{} \; \
+		-exec touch $1/{}/config-compat.h \;
 done
 
-for x in `find include -type d | grep -v CVS` ; do
-	mkdir -p -v $1/$x
-done
-
-for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -f -s $PWD/$x $1/$x
-done
-
-for x in `find drivers -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -f -s $PWD/$x $1/$x
-done
-
-for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -f -s $PWD/$x $1/$x
-done
-
-for x in `find include -type d | grep -v CVS` ; do
-	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
-	touch $1/$x/config-compat.h
-done
-
-for x in `find drivers/media -type d | grep -v CVS` ; do
-	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
-	touch $1/$x/config-compat.h
-done
-
-cd ..
+cat > $1/drivers/media/Kbuild <<EOF
+EXTRA_CFLAGS+=-include include/linux/version.h
+export EXTRA_CFLAGS
+include drivers/media/Makefile
+EOF