summaryrefslogtreecommitdiff
path: root/v4l/Makefile
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-11-26 19:00:09 +0000
committerMichael Krufky <devnull@localhost>2005-11-26 19:00:09 +0000
commite0c28ec723cd2ebe90c13206d441c4d654860125 (patch)
treee88233da37fcc849bf0f57e1f1f1cc3bb34e1f04 /v4l/Makefile
parent251d93ecd077b29e3c8662a637300fc2a88a3164 (diff)
downloadmediapointer-dvb-s2-e0c28ec723cd2ebe90c13206d441c4d654860125.tar.gz
mediapointer-dvb-s2-e0c28ec723cd2ebe90c13206d441c4d654860125.tar.bz2
Alter build configuration for official merged v4l+dvb development tree.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/Makefile')
-rw-r--r--v4l/Makefile20
1 files changed, 5 insertions, 15 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 2dc073538..6d8ab5bb7 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -140,6 +140,7 @@ ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y)
endif
# for DVB
+EXTRA_CFLAGS += -DDVB_CVS=1
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
@@ -271,18 +272,13 @@ default:: links .version
links::
@echo creating symbolic links...
- @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
+ @find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
# @find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \;
@ln -sf ../linux/drivers/media/common/ir-common.c .
-dvb-links::
- @find ../linux/drivers/media/common -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
- @find ../linux/drivers/media/dvb -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
- @find ../linux/include -name '*.h' -type l -exec ln -sf '{}' . \;
-
-install:: rminstall
+install:: rminstall dvb-install
@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
@strip --strip-debug $(inst-m)
@@ -317,15 +313,9 @@ v4l_install:: rminstall
/sbin/depmod -a
-kernel-links:: merge-trees
+kernel-links::
cd ..; v4l/scripts/makelinks.sh $(KDIR)
-merge-trees::
- @scripts/merge-trees.sh
-
-unmerge-trees::
- @scripts/unmerge-trees.sh
-
dvb-install:: dvb-rminstall
@echo -e "\nInstalling new DVB modules at corresponding Kernel dir..."
@@ -389,7 +379,7 @@ dvb-rminstall::
$(addprefix $(KDIR26)/dvb/ttusb-dec/, $(addsuffix .gz,$(inst_ttusb-dec))) 2>/dev/null
@echo
-rminstall::
+rminstall:: dvb-rminstall
@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
-@rm -r $(DEST) \