Merge pull request #5 from VittGam/master

dahdi-tools: Removed dahdi_tool, as it requires libnewt (it's not optional unfortunately). Also add fxotune.
This commit is contained in:
Jiri Slachta 2014-12-23 12:48:26 +01:00
commit 1ddf257a9c

View file

@ -31,7 +31,7 @@ endef
define Package/dahdi-cfg
$(call Package/dahdi-cfg/Default)
DEPENDS+=+libpthread
TITLE:=DAHDI tools dahdi_cfg and dahdi_scan
TITLE:=DAHDI tools dahdi_cfg, dahdi_scan and fxotune
endef
define Package/dahdi-monitor
@ -39,11 +39,6 @@ define Package/dahdi-monitor
TITLE:=DAHDI tools dahdi_monitor, dahdi_speed and dahdi_test
endef
define Package/dahdi-tool
$(call Package/dahdi-cfg/Default)
TITLE:=DAHDI tools dahdi_tool
endef
define Package/dahdi-tools-libtonezone
$(call Package/dahdi-cfg/Default)
SECTION:=libs
@ -54,13 +49,6 @@ endef
TARGET_CFLAGS += $(FPIC)
EXTRA_CFLAGS:= $(TARGET_CPPFLAGS)
CONFIGURE_ARGS+= \
--with-dahdi="$(STAGING_DIR)/usr" \
--without-newt \
--without-usb \
--without-selinux \
--without-ppp
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
@ -72,7 +60,7 @@ define Build/Compile
INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
DAHDI_INCLUDE="$(STAGING_DIR)/usr/include" \
CONFIGURE_SILENT="--silent" \
dahdi_cfg dahdi_monitor dahdi_tool dahdi_scan dahdi_speed dahdi_test fxotune libs
dahdi_cfg dahdi_monitor dahdi_scan dahdi_speed dahdi_test fxotune libs
endef
define Build/InstallDev
@ -88,6 +76,7 @@ define Package/dahdi-cfg/install
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_BUILD_DIR)/dahdi_cfg $(1)/usr/sbin/
$(CP) $(PKG_BUILD_DIR)/dahdi_scan $(1)/usr/sbin/
$(CP) $(PKG_BUILD_DIR)/fxotune $(1)/usr/sbin/
endef
define Package/dahdi-monitor/install
@ -97,11 +86,6 @@ define Package/dahdi-monitor/install
$(CP) $(PKG_BUILD_DIR)/dahdi_test $(1)/usr/sbin/
endef
define Package/dahdi-tool/install
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_BUILD_DIR)/dahdi_tool $(1)/usr/sbin/
endef
define Package/dahdi-tools-libtonezone/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/libtonezone.so $(1)/usr/lib/
@ -110,5 +94,4 @@ endef
$(eval $(call BuildPackage,dahdi-cfg))
$(eval $(call BuildPackage,dahdi-monitor))
$(eval $(call BuildPackage,dahdi-tool))
$(eval $(call BuildPackage,dahdi-tools-libtonezone))