diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-02-16 23:11:16 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-02-16 23:11:16 -0500 |
| commit | c5afcf940212386e9ddb07960b1922b1b110571f (patch) | |
| tree | cccfd70b5f0635e318e981a80cf86392d13ecc8e /v4l/Makefile | |
| parent | 661d60c7bfbc5c9f4fc76d85c33ef4ae2aaadddf (diff) | |
| download | mediapointer-dvb-s2-c5afcf940212386e9ddb07960b1922b1b110571f.tar.gz mediapointer-dvb-s2-c5afcf940212386e9ddb07960b1922b1b110571f.tar.bz2 | |
update 'make pvrusb2' merged build command
From: Michael Krufky <mkrufky@linuxtv.org>
- use file .pvrusb2-merged to determine tree state rather than
the previous method, which used a self-altering Makefile through an
embedded patch in merge-pvrusb2.sh (removed)
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'v4l/Makefile')
| -rw-r--r-- | v4l/Makefile | 9 |
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 |