summaryrefslogtreecommitdiff
path: root/v4l/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/Makefile')
-rw-r--r--v4l/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index d89639307..c3bfdfaf5 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -344,10 +344,9 @@ default:: links .version
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
pvrusb2::
- @scripts/merge-pvrusb2.sh
-
-pvrusb2-unmerge::
-# patch -R -p1 < scripts/merge-pvrusb2.sh
+ @echo creating pvrusb2 symbolic links...
+ @find ../v4l_experimental/pvrusb2 -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
+ @echo 'm' > .pvrusb2-merge
ivtv-checkout::
@if [ ! -d ivtv ]; then \
@@ -522,7 +521,7 @@ rmmodules::
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
+ -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h .pvrusb2-merge
distclean:: clean
-rm -f .version .*.o.flags .*.o.d