diff options
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/Makefile | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index e4ec457f6..85cbf76be 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-19 00:20 mkrufky + + * ../v4l/Makefile: + - Fix normal v4l build. Tree-merge temporarily disabled. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-18 23:50 nshmyrev * ../linux/drivers/media/video/tda8290.c: (tda8290_init): diff --git a/v4l/Makefile b/v4l/Makefile index 909df59a9..969b092a2 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -162,7 +162,7 @@ inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko -v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) +v4l_modules := $(shell /sbin/lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) # locales seem to cause trouble sometimes. LC_ALL = POSIX @@ -176,14 +176,14 @@ links:: @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \; @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; -# for merged-trees: - @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; - @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -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/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; + @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; + install:: rminstall @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." |