summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2006-09-01 14:58:26 -0700
committerTrent Piepho <xyzzy@speakeasy.org>2006-09-01 14:58:26 -0700
commita77c4dd9c2118e6c5ba3a132d731db3cc3a1bcf4 (patch)
tree3ebfce76cff9187385d3b30693d352f1809e53c4
parent0935e7b9736f0c6d9699bc20a77e053a3527b366 (diff)
downloadmediapointer-dvb-s2-a77c4dd9c2118e6c5ba3a132d731db3cc3a1bcf4.tar.gz
mediapointer-dvb-s2-a77c4dd9c2118e6c5ba3a132d731db3cc3a1bcf4.tar.bz2
Fix compilation of modules that need OSS headers
From: Trent Piepho <xyzzy@speakeasy.org> Create a symlink, v4l/oss, that points back to the v4l directory. This way code that includes "oss/something.h" will find the header files it wants (which has been linked to from v4l). The link will be created only if it doesn't exist and deleted by distclean. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
-rw-r--r--v4l/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 963146eaa..f9af44703 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -30,7 +30,7 @@ endif
#################################################
# default compilation rule
-default:: config-compat.h Makefile.media links .version
+default:: config-compat.h Makefile.media links .version oss
@if [ "x$(SRCDIR)" != x ]; then echo SRCDIR is $(SRCDIR) ; fi
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
./scripts/rmmod.pl check
@@ -229,6 +229,10 @@ links::
@find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \;
@find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \;
+# This link is so code with #include "oss/*.h" will find its header files
+oss:
+ ln -sf . oss
+
config-compat.h:: .myconfig
@perl \
-e 'print "#ifndef __CONFIG_COMPAT_H__\n";' \
@@ -267,7 +271,7 @@ distclean:: clean
Kconfig Kconfig.kern .config .config.cmd .myconfig \
.kconfig.dep
-rm -rf .tmp_versions
- -rm -f scripts/lxdialog scripts/kconfig
+ -rm -f scripts/lxdialog scripts/kconfig oss
@find .. -name '*.orig' -exec rm '{}' \;
@find .. -name '*.rej' -exec rm '{}' \;