diff options
| -rw-r--r-- | v4l/ChangeLog | 13 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/Kbuild | 32 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/Makefile | 71 |
3 files changed, 20 insertions, 96 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 9d26b7ac7..a92f638da 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,16 @@ +2006-01-15 02:26 mcisely + + * v4l_experimental/pvrusb2/Kbuild: + * v4l_experimental/pvrusb2/Makefile: + + -Remove last vestiges of previous pvrusb2 build setup, since this + build is driven now by the main build. Makefile here is adjusted + to outsource build actions "upstairs" to V4L if it is still used + so previous behavior is still present. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + Signed-off-by: Mike Isely <isely@pobox.com> + 2006-01-15 01:05 mkrufky * v4l/scripts/merge-pvrusb2.sh: diff --git a/v4l_experimental/pvrusb2/Kbuild b/v4l_experimental/pvrusb2/Kbuild deleted file mode 100644 index 635e58b28..000000000 --- a/v4l_experimental/pvrusb2/Kbuild +++ /dev/null @@ -1,32 +0,0 @@ - -pvrusb2-objs := \ - pvrusb2-i2c-core.o \ - pvrusb2-i2c-cmd-v4l2.o \ - pvrusb2-audio.o \ - pvrusb2-i2c-chips-v4l2.o \ - pvrusb2-encoder.o \ - pvrusb2-video-v4l.o \ - pvrusb2-eeprom.o \ - pvrusb2-tuner.o \ - pvrusb2-demod.o \ - pvrusb2-main.o \ - pvrusb2-hdw.o \ - pvrusb2-v4l2.o \ - pvrusb2-sysfs.o \ - pvrusb2-context.o \ - pvrusb2-io.o \ - pvrusb2-ioread.o \ - pvrusb2-debugifc.o \ - $(END) - -obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o - -# Stuff for Emacs to see, in order to encourage consistent editing style: -# *** Local Variables: *** -# *** mode: Makefile *** -# *** fill-column: 75 *** -# *** indent-tabs-mode: nil *** -# *** End: *** - -# Similarly for vim to see: -# vim:expandtab:textwidth=75 diff --git a/v4l_experimental/pvrusb2/Makefile b/v4l_experimental/pvrusb2/Makefile index 88eb298b6..0c43d6977 100644 --- a/v4l_experimental/pvrusb2/Makefile +++ b/v4l_experimental/pvrusb2/Makefile @@ -1,67 +1,10 @@ +BUILD_DIR := $(shell pwd)/../.. -# Mike Isely <isely@pobox.com> +all: + $(MAKE) -C $(BUILD_DIR) pvrusb2 -# This is the module build file for pvrusb2 (ONLY when built as part -# of v4l in the experimental area). It requires the kbuild system -# from any 2.6.x kernel. It requires the kbuild system from any 2.6.x -# kernel (but it's only been tried against kernels 2.6.10 and later). -# This WILL NOT BUILD for 2.4.x kernels. Don't even bother trying. -# Even if you were to fix this build for 2.4.x, you would still have -# to port the driver as well. Everything here assumes 2.6.x. - -# To build, you can just run this Makefile. There are several -# variables you may want to override however: - -# KDIR - Path to kernel source tree -# KREL - Version of kernel, i.e. 'uname -r' output -# INSTALL_MOD_DIR - where within the module tree to put the driver - -# If you do not override anything, then KREL is set to the result of -# 'uname -r', KDIR is set to '/lib/modules/$(KREL)/build', and -# INSTALL_MOD_DIR is set to 'pvrusb2'. If you choose to override -# KDIR, then you do _NOT_ need to worry about KREL, as KREL is only -# used here when calculating KDIR. If the default path for KDIR is -# only wrong in terms of version element, then you can just override -# KREL with the corrected value. - -# Sensible build targets include 'modules' (same as no target), -# 'install', and 'clean' - -# For building within the v4l experimental area, we have to adjust our -# include paths and also ensure that the environment as been set up -# (which is presumably what the "links" callout is for). - -ifeq ($(KERNELRELEASE),) - - # Override any of these if you'd like - ifeq ($(strip $(KREL)),) - KREL := $(shell uname -r) - endif - ifeq ($(strip $(KDIR)),) - KDIR := /lib/modules/$(KREL)/build - endif - INSTALL_MOD_DIR := pvrusb2 - - .PHONY: all default install clean modules - default: all - all: modules - - M:=$(shell pwd) - - CPPFLAGS:= -D__KERNEL__ -I$(M)/../../linux/include -I$(M)/../../v4l $(CPPFLAGS) -I$(KDIR)/include - - modules modules_install clean: - $(MAKE) -C $(M)/../.. links - $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) "CPPFLAGS=$(CPPFLAGS)" -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m $@ - - install: - $(MAKE) -C $(M)/../.. links - $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) "CPPFLAGS=$(CPPFLAGS)" -C $(KDIR) M=$(M) CONFIG_VIDEO_PVRUSB2=m modules_install - -else - - # Backwards compatibility in case kbuild can't find Kbuild on its own. - include Kbuild - -endif +install: + $(MAKE) -C $(BUILD_DIR) install +%:: + $(MAKE) -C $(BUILD_DIR) $(MAKECMDGOALS) |