diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-20 22:40:11 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-20 22:40:11 +0000 |
| commit | d653250809bfefc4427705e3d9fe45c54586ccf3 (patch) | |
| tree | 8b22eb3a57540633e0f0c783a8a9c79e7d49bd9e /drivers/dahdi/Kbuild | |
| parent | a8cc1e7138795a0ea33afea701317c1d6054a84d (diff) | |
merge modular_ec branch, which adds modular echocan support and lots of minor fixes and improvements... seems to work properly, except the usecount on the echocan modules never increments above zero, so they are unloadable when they should not be
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4436 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/Kbuild')
| -rw-r--r-- | drivers/dahdi/Kbuild | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index b25ad29..0157d83 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -1,7 +1,3 @@ -ifdef ECHO_CAN_NAME - ECHO_CAN_CFLAGS := -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME) -endif - obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC) += dahdi_dynamic.o @@ -24,8 +20,13 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_PCIRADIO) += pciradio.o obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP) += xpp/ +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_JPAH) += dahdi_echocan_jpah.o +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE) += dahdi_echocan_sec.o +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2) += dahdi_echocan_sec2.o +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_KB1) += dahdi_echocan_kb1.o +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2) += dahdi_echocan_mg2.o + CFLAGS_MODULE += -I$(src) -EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS) ifndef HOTPLUG_FIRMWARE ifneq (,$(filter y m,$(CONFIG_FW_LOADER))) @@ -45,23 +46,25 @@ endif dahdi-objs := dahdi-base.o +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-objs += hpec/hpec_x86_32.o +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-objs += hpec/hpec_x86_64.o +dahdi_echocan_hpec-objs += hpec/hpec_x86_64.o endif endif ifeq ($(HPEC_PRESENT),yes) -EXTRA_CFLAGS += -DECHO_CAN_HPEC -I$(src)/hpec -$(obj)/dahdi-base.o: $(src)/hpec/hpec_dahdi.h $(src)/hpec/hpec_user.h +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_HPEC) += dahdi_echocan_hpec.o endif $(obj)/pciradio.o: $(obj)/radfw.h |