Changeset 5732

Show
Ignore:
Timestamp:
03/07/10 20:06:44 (3 years ago)
Author:
jow
Message:

luci-0.9: merge r5730 amd r5731

Location:
luci/branches/luci-0.9
Files:
12 removed
1 modified

Legend:

Unmodified
Added
Removed

  • luci/branches/luci-0.9/contrib/package/luci/Makefile

    r5727 r5732  
    257257  $(call Package/luci/libtemplate) 
    258258  TITLE:=NIXIO POSIX Library 
    259   DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl-luci 
     259  DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl 
    260260endef 
    261261 
    … …  
    566566 
    567567 
    568 define Package/luci-app-uvc_streamer 
    569   $(call Package/luci/webtemplate) 
    570   DEPENDS+=+luci-admin-full +PACKAGE_luci-app-uvc_streamer:uvc-streamer 
    571   TITLE:=Webcam Streaming - UVC-Streamer module 
    572 endef 
    573  
    574 define Package/luci-app-uvc_streamer/install 
    575         $(call Package/luci/install/template,$(1),applications/luci-uvc_streamer) 
    576 endef 
    577  
    578  
    579568define Package/luci-app-mmc_over_gpio 
    580569  $(call Package/luci/webtemplate) 
    … …  
    994983ifneq ($(CONFIG_PACKAGE_luci-app-samba),) 
    995984    PKG_SELECTED_MODULES+=applications/luci-samba 
    996 endif 
    997 ifneq ($(CONFIG_PACKAGE_luci-app-uvc_streamer),) 
    998     PKG_SELECTED_MODULES+=applications/luci-uvc_streamer 
    999985endif 
    1000986ifneq ($(CONFIG_PACKAGE_luci-app-mmc_over_gpio),) 
    … …  
    11391125$(eval $(call BuildPackage,luci-app-ddns)) 
    11401126$(eval $(call BuildPackage,luci-app-samba)) 
    1141 $(eval $(call BuildPackage,luci-app-uvc_streamer)) 
    11421127$(eval $(call BuildPackage,luci-app-mmc_over_gpio)) 
    11431128$(eval $(call BuildPackage,luci-app-p910nd))