b43: merge ad-hoc beacon fix

[openwrt.git] / package / ltq-dsl-app / Makefile

diff --git a/package/ltq-dsl-app/Makefile b/package/ltq-dsl-app/Makefile
index 1b1aa36..fb3e4ac 100644 (file)
--- a/package/ltq-dsl-app/Makefile
+++ b/package/ltq-dsl-app/Makefile
@@ -16,6 +16,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/
 PKG_MD5SUM:=ee315306626b68794d3d3636dabfe161
 
+PKG_CONFIG_DEPENDS:=\
+       CONFIG_LTQ_DSL_ENABLE_CLI \
+       CONFIG_LTQ_DSL_ENABLE_DSL_EVENT_POLLING
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ltq-dsl-app
@@ -25,21 +29,25 @@ define Package/ltq-dsl-app
   URL:=http://www.lantiq.com/
   DEPENDS:=@TARGET_lantiq_danube +kmod-ltq-dsl +libpthread
   MAINTAINER:=John Crispin <blogic@openwrt.org> 
+  MENU:=1
 endef
 
 define Package/ltq-dsl-app/description
        Infineon DSL CPE API for Amazon SE, Danube and Vinax.
 endef
 
-IFX_DSL_MAX_DEVICE=1
-IFX_DSL_LINES_PER_DEVICE=1
-IFX_DSL_CHANNELS_PER_LINE=1
-#CONFIG_IFX_CLI=y
+define Package/ltq-dsl-app/config
+       source "$(SOURCE)/Config.in"
+endef
+
+LTQ_DSL_MAX_DEVICE=1
+LTQ_DSL_LINES_PER_DEVICE=1
+LTQ_DSL_CHANNELS_PER_LINE=1
 
 CONFIGURE_ARGS += \
-       --with-max-device="$(IFX_DSL_MAX_DEVICE)" \
-       --with-lines-per-device="$(IFX_DSL_LINES_PER_DEVICE)" \
-       --with-channels-per-line="$(IFX_DSL_CHANNELS_PER_LINE)" \
+       --with-max-device="$(LTQ_DSL_MAX_DEVICE)" \
+       --with-lines-per-device="$(LTQ_DSL_LINES_PER_DEVICE)" \
+       --with-channels-per-line="$(LTQ_DSL_CHANNELS_PER_LINE)" \
        --enable-danube \
        --enable-driver-include="-I$(STAGING_DIR)/usr/include" \
        --enable-debug-prints \
@@ -61,12 +69,17 @@ CONFIGURE_ARGS += \
        --enable-dsl-pm-line-thresholds \
        --enable-dsl-pm-optional-parameters
 
-ifeq ($(CONFIG_IFX_CLI),y)
+ifeq ($(CONFIG_LTQ_DSL_ENABLE_CLI),y)
 CONFIGURE_ARGS += \
        --enable-cli-support \
        --enable-soap-support
 endif
 
+ifeq ($(CONFIG_LTQ_DSL_ENABLE_DSL_EVENT_POLLING),y)
+CONFIGURE_ARGS += \
+       --enable-dsl-event-polling
+endif
+
 TARGET_CFLAGS += -I$(LINUX_DIR)/include
 
 define Package/ltq-dsl-app/install