diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-12 22:03:33 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-05-12 22:03:33 +0000 |
| commit | c7c483497958f11a1a7ed3e4788c3287d067db33 (patch) | |
| tree | 8f8470adbbdda9f1985a81937123773645753aad | |
| parent | 31f23edc74c865e13ef904e1926cd9e87b5611df (diff) | |
emit warning messages when DAHDI is being built on a CPU architecture that does not support HPEC or the VPMADT032 firmware loader, so the user will know why they are not included
clean up the conditional logic for these items in the Kbuild file
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6607 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/Kbuild | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index d897fa8..1bfa63d 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -77,14 +77,14 @@ ifeq ($(ARCH),i386) dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_x86_32.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o endif -else - ifeq ($(ARCH),x86_64) - ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_x86_64.o_shipped),) - VPMADT032_LOADER_PRESENT=yes - dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_x86_64.o - obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o - endif +else ifeq ($(ARCH),x86_64) + ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_x86_64.o_shipped),) + VPMADT032_LOADER_PRESENT=yes + dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_x86_64.o + obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER) += dahdi_vpmadt032_loader.o endif +else +$(warning CPU Architecture '$(ARCH)' does not support VPMADT032 firmware downloader. Skipping.) endif ############################################################################### @@ -95,17 +95,17 @@ dahdi_echocan_hpec-objs := hpec/dahdi_echocan_hpec.o CFLAGS_dahdi_echocan_hpec.o := -I$(src)/hpec ifeq ($(ARCH),i386) -ifneq ($(wildcard $(src)/hpec/hpec_x86_32.o_shipped),) -HPEC_PRESENT=yes -dahdi_echocan_hpec-objs += hpec/hpec_x86_32.o -endif -endif - -ifeq ($(ARCH),x86_64) -ifneq ($(wildcard $(src)/hpec/hpec_x86_64.o_shipped),) -HPEC_PRESENT=yes -dahdi_echocan_hpec-objs += hpec/hpec_x86_64.o -endif + ifneq ($(wildcard $(src)/hpec/hpec_x86_32.o_shipped),) + HPEC_PRESENT=yes + dahdi_echocan_hpec-objs += hpec/hpec_x86_32.o + endif +else ifeq ($(ARCH),x86_64) + ifneq ($(wildcard $(src)/hpec/hpec_x86_64.o_shipped),) + HPEC_PRESENT=yes + dahdi_echocan_hpec-objs += hpec/hpec_x86_64.o + endif +else +$(warning CPU Architecture '$(ARCH)' does not support HPEC echo canceller. Skipping.) endif ifeq ($(HPEC_PRESENT),yes) |