[svn-commits] kpfleming: linux/trunk r6607 - /linux/trunk/drivers/dahdi/Kbuild

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue May 12 17:03:33 2009
New Revision: 6607

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6607
Log:
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


Modified:
    linux/trunk/drivers/dahdi/Kbuild

Modified: linux/trunk/drivers/dahdi/Kbuild
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/Kbuild?view=diff&rev=6607&r1=6606&r2=6607
==============================================================================
--- linux/trunk/drivers/dahdi/Kbuild (original)
+++ linux/trunk/drivers/dahdi/Kbuild Tue May 12 17:03:33 2009
@@ -77,14 +77,14 @@
     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
-  endif
+$(warning CPU Architecture '$(ARCH)' does not support VPMADT032 firmware downloader. Skipping.)
 endif
 
 ###############################################################################
@@ -95,17 +95,17 @@
 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)