diff options
Diffstat (limited to 'v4l/Makefile')
| -rw-r--r-- | v4l/Makefile | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index f08143def..0b2f54c99 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -40,7 +40,7 @@ default:: config-compat.h Makefile.media links $(obj)/.version oss # Targets which don't need Makefile.media's rules no-makefile-media-targets := %config clean distclean release snapshot snap \ tarball release %links start insmod load stop rmmod unload reload \ - card% update push %commit help debug ivtv% cx88-ivtv lxdialog + card% update push %commit help debug cx88-ivtv lxdialog # Targets which don't need .myconfig to exist, to keep us from including it no-dot-config-targets := $(no-makefile-media-targets) %install remove @@ -69,7 +69,6 @@ ifeq ($(makefile-media),1) endif -include $(obj)/.kconfig.dep --include $(obj)/Makefile.ivtv # make will try to automatically rebuild the Makefile and all includes, # and if any of them change, make will start over with the updated files @@ -183,9 +182,9 @@ all:: default ################################################# # installation invocation rules -install:: media-install ivtv-install +install:: media-install -remove rminstall:: media-rminstall ivtv-rminstall +remove rminstall:: media-rminstall ################################################# # Compiling preparation rules @@ -271,7 +270,7 @@ clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ - ivtv-svnversion.h config-compat.h + config-compat.h distclean:: clean -rm -f .version .*.o.flags .*.o.d Makefile.media \ @@ -365,30 +364,6 @@ $(LXDIALOG): $(MAKE) -C $(KDIR) -f $(PWD)/Makefile.kernel $(KMAKEVARS) v4l-$(LXDIALOG) endif -################################################# -# IVTV link rules - -ivtv-checkout:: - @if [ ! -d ivtv ]; then \ - echo retrieving the latest ivtv sources from ivtvdriver.org; \ - echo this step requires subversion to be installed; \ - svn co http://www.ivtvdriver.org/svn/ivtv/trunk ivtv; \ - fi - -ivtv-update ivtv-up:: ivtv - @svn up ivtv - -ivtv-links:: ivtv-checkout - @echo creating ivtv symbolic links... - @find ivtv/driver -name '*.[ch]' -type f -exec ln -sf '{}' . \; - @find ivtv/i2c-drivers -name '*.[ch]' -type f -exec ln -sf '{}' . \; - -ivtv:: ivtv-links - @echo '#define IVTV_DRIVER_VERSION_COMMENT ' \ - '"(v4l-dvb + ivtv virtual merge)' \ - "`svn info ivtv | grep Revision`"'"' > ivtv-svnversion.h - @echo ivtv trunk merged. Run make to build the entire tree. - cx88-ivtv:: @echo creating cx88-ivtv symbolic links... @ln -sf ../v4l_experimental/cx88-ivtv.c . |