diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2006-12-21 03:44:09 -0800 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2006-12-21 03:44:09 -0800 |
| commit | 682eb716861233b79d9e5c2fec491487de2b0b37 (patch) | |
| tree | a2aeff2439ec01ff1b3401282648c965bd7af430 /v4l | |
| parent | 347e062eb0f9b8ef3dd8fb68629baa2e8b5a134e (diff) | |
| download | mediapointer-dvb-s2-682eb716861233b79d9e5c2fec491487de2b0b37.tar.gz mediapointer-dvb-s2-682eb716861233b79d9e5c2fec491487de2b0b37.tar.bz2 | |
Support kernels where make menuconfig doesn't need lxdialog
From: Trent Piepho <xyzzy@speakeasy.org>
make menuconfig used to need to build two kernel configuration programs,
mconf and lxdialog. In 2.6.19-rc1, this was changed so there no longer
was a separate lxdialog binary, it was integrated into mconf.
This adapts the v4l-dvb Makefile to check for lxdialog/Makefile, if it's
not present then no lxdialog binary needs to be built. The rules and
dependencies on lxdialog will be omitted from the v4l-dvb Makefile in
that case.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index c8f42006d..7674abd98 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -301,8 +301,13 @@ CONF := $(KDIR)/scripts/kconfig/conf # lxdialog can be in either scripts/lxdialog or scripts/kconfig/lxdialog LXDIALOG_DIR := $(shell if [ -d $(KDIR)/scripts/kconfig/lxdialog ]; then echo kconfig/ ; fi) -LXDIALOG_LNK := $(if $(LXDIALOG_DIR),scripts/kconfig,scripts/lxdialog) -LXDIALOG := $(KDIR)/scripts/$(LXDIALOG_DIR)lxdialog/lxdialog +# lxdialog might not be a separate program that needs to be built, check +# for lxdialog/Makefile to find out. +ifneq ($(wildcard $(KDIR)/scripts/$(LXDIALOG_DIR)lxdialog/Makefile),) + # lxdialog must be built + LXDIALOG_LNK := $(if $(LXDIALOG_DIR),scripts/kconfig,scripts/lxdialog) + LXDIALOG := $(KDIR)/scripts/$(LXDIALOG_DIR)lxdialog/lxdialog +endif # Ideally, some kind of oldconfig process would be used to update .config # without destroying the user's configuration. Lacking that, we will @@ -345,11 +350,13 @@ $(QCONF) $(GCONF) $(MCONF) $(CONF): .PHONY: lxdialog lxdialog: $(LXDIALOG) $(LXDIALOG_LNK) +ifdef LXDIALOG $(LXDIALOG_LNK): ln -snf $(KDIR)/$(LXDIALOG_LNK) $(LXDIALOG_LNK) $(LXDIALOG): $(MAKE) -C $(KDIR) -f $(PWD)/Makefile.kernel $(KMAKEVARS) v4l-$(LXDIALOG) +endif ################################################# # IVTV link rules |