Changeset 1577

Show
Ignore:
Timestamp:
01/13/07 16:50:41 (2 years ago)
Author:
wbx
Message:

fix zaptel asterisk build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/pkg-depend.mk

    r1398 r1577  
    127127xsupplicant-compile: openssl-compile 
    128128 
    129 asterisk-compile: ncurses-compile openssl-compile zlib-compile 
     129asterisk-compile: ncurses-compile openssl-compile zaptel-compile zlib-compile 
    130130 
    131131ifneq ($(FWRT_PACKAGE_ASTERISK_CHAN_BLUETOOTH),) 

  • trunk/freewrt/package/Config.in

    r1413 r1577  
    304304source "package/uclibc++/Config.in" 
    305305source "package/ustl/Config.in" 
     306source "package/zaptel/Config.in" 
    306307source "package/zlib/Config.in" 
    307308endmenu 

  • trunk/freewrt/package/asterisk/Config.in

    r1527 r1577  
    1 #menu "asterisk.......................... Complete open source PBX" 
     1menu "asterisk.......................... Complete open source PBX" 
    22 
    33config FWRT_PACKAGE_ASTERISK 
    44        prompt "asterisk.......................... Complete open source PBX" 
    55        tristate 
     6        select FWRT_PACKAGE_ZAPTEL 
    67        default n 
    78        help 
    …… 
    129130        help 
    130131          Voicemail related modules for Asterisk 
    131  
    132 config FWRT_PACKAGE_ASTERISK_MINI 
    133         prompt "asterisk-mini..................... Minimal open source PBX" 
    134         tristate 
    135         default n 
    136         help 
    137           Asterisk is a complete PBX in software. It provides all of the features 
    138           you would expect from a PBX and more. Asterisk does voice over IP in three 
    139           protocols, and can interoperate with almost all standards-based telephony  
    140           equipment using relatively inexpensive hardware. 
    141            
    142           http://www.asterisk.org/ 
    143            
    144           This package contains only the following modules: 
    145             - chan_iax2 
    146             - chan_local 
    147             - chan_sip 
    148             - codec_gsm 
    149             - codec_ulaw 
    150             - format_gsm 
    151             - format_pcm 
    152             - format_wav 
    153             - format_wav_gsm 
    154             - pbx_config 
    155             - res_features 
    156             - res_musiconhold 
    157  
    158 #endmenu 
     132endmenu 

  • trunk/freewrt/package/asterisk/Makefile

    r1564 r1577  
    8989CONFIGURE_ARGS+=        --with-curl=${STAGING_DIR}/usr 
    9090endif 
    91 #ifneq (${FWRT_PACKAGE_KMOD_ZAPTEL},) 
    92 #CONFIGURE_ARGS+=       --with-zaptel=${TOPDIR}/build-mipsel/w-zaptel-1.4.0/zaptel-1.4.0/ 
    93 #else 
     91ifneq (${FWRT_PACKAGE_ZAPTEL},) 
     92CONFIGURE_ARGS+=        --with-zaptel=${STAGING_DIR}/usr 
     93else 
    9494CONFIGURE_ARGS+=        --without-zaptel 
    95 #endif 
     95endif 
    9696 
    9797$(WRKBUILD)/.configured: 

  • trunk/freewrt/package/zaptel/Makefile

    r1563 r1577  
    1717include $(TOPDIR)/mk/package.mk 
    1818 
     19$(eval $(call PKG_template,ZAPTEL,zaptel,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    1920$(eval $(call PKG_template,KMOD_ZAPTEL,kmod-zaptel,$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    2021$(eval $(call PKG_template,KMOD_ZTDUMMY,kmod-ztdummy,$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    …… 
    6263            CC="$(TARGET_CC)" \ 
    6364            LD="$(TARGET_CROSS)ld" \ 
    64             CFLAGS="$(KFLAGS) -fno-common" \ 
     65            CFLAGS="$(KFLAGS)" \ 
    6566            BUILD_XPP=no \ 
    6667            KSRC="$(LINUX_DIR)" \ 
    …… 
    6970            MODULES="zaptel ztdummy" \ 
    7071            linux26 V=1 
     72        $(MAKE) -C $(WRKBUILD) \ 
     73            PATH="$(TARGET_PATH)" \ 
     74            CC="$(TARGET_CC)" \ 
     75            KSRC="$(LINUX_DIR)" \ 
     76            INSTALL_PREFIX="$(WRKINST)" \ 
     77            install-include install-libs 
    7178        touch $@ 
     79 
     80$(IPKG_ZAPTEL): 
     81        $(INSTALL_DIR) $(IDIR_ZAPTEL)/usr/lib 
     82        $(CP) $(WRKINST)/usr/lib/libtonezone.so.* $(IDIR_ZAPTEL)/usr/lib 
     83        $(IPKG_BUILD) $(IDIR_ZAPTEL) $(PACKAGE_DIR) 
    7284 
    7385$(IPKG_KMOD_ZAPTEL): 
    …… 
    8294                $(IDIR_KMOD_ZTDUMMY)/lib/modules/$(KERNEL_VERSION)/ 
    8395        $(IPKG_BUILD) $(IDIR_KMOD_ZTDUMMY) $(PACKAGE_DIR) 
     96 
     97$(STAGING_DIR)/usr/lib/libtonezone.so: $(WRKBUILD)/.built 
     98        $(INSTALL_DIR) $(STAGING_DIR)/usr/lib 
     99        $(INSTALL_DIR) $(STAGING_DIR)/usr/include 
     100        $(CP) $(WRKINST)/usr/lib/libtonezone.so.* $(STAGING_DIR)/usr/lib/ 
     101        $(CP) $(WRKINST)/usr/include/zaptel $(STAGING_DIR)/usr/include/ 
     102 
     103compile-targets: install-dev 
     104clean-targets: uninstall-dev 
     105 
     106install-dev: $(STAGING_DIR)/usr/lib/libtonezone.so 

  • trunk/freewrt/target/linux/Config.in

    r1561 r1577  
    11451145source package/switch/Config.in 
    11461146source package/wlcompat/Config.in 
    1147 source package/zaptel/Config.in 
     1147source package/zaptel/Config.in.kernel 
    11481148 
    11491149endmenu