Changeset 6284

Show
Ignore:
Timestamp:
10/12/10 06:22:38 (3 years ago)
Author:
jow
Message:

libs: merge libs/http into libs/web

Location:
luci/trunk
Files:
1 modified
1 moved

Legend:

Unmodified
Added
Removed

  • luci/trunk/contrib/package/luci/Makefile

    r6283 r6284  
    180180 
    181181 
    182 define Package/luci-http 
    183   $(call Package/luci/libtemplate) 
    184   TITLE:=HTTP Protocol implementation 
    185 endef 
    186  
    187 define Package/luci-http/install 
    188     $(call Package/luci/install/template,$(1),libs/http) 
    189 endef 
    190  
    191  
    192182define Package/luci-httpclient 
    193183  $(call Package/luci/libtemplate) 
    194184  TITLE:=HTTP(S) client library 
    195   DEPENDS+=+luci-http +luci-nixio 
     185  DEPENDS+=+luci-web +luci-nixio 
    196186endef 
    197187 
    … …  
    245235  $(call Package/luci/webservertemplate) 
    246236  TITLE:=LuCId Full-Stack Webserver 
    247   DEPENDS+=+luci-nixio +luci-http +luci-px5g 
     237  DEPENDS+=+luci-nixio +luci-web +luci-px5g 
    248238endef 
    249239 
    … …  
    326316define Package/luci-web 
    327317  $(call Package/luci/libtemplate) 
    328   DEPENDS+=+luci-http +luci-sys +luci-nixio +luci-uci \ 
     318  DEPENDS+=+luci-sys +luci-nixio +luci-uci \ 
    329319    +luci-sgi-cgi +luci-lmo 
    330320  TITLE:=MVC Webframework 
    … …  
    10621052    PKG_SELECTED_MODULES+=libs/fastindex 
    10631053endif 
    1064 ifneq ($(CONFIG_PACKAGE_luci-http),) 
    1065     PKG_SELECTED_MODULES+=libs/http 
    1066 endif 
    10671054ifneq ($(CONFIG_PACKAGE_luci-httpclient),) 
    10681055    PKG_SELECTED_MODULES+=libs/httpclient 
    … …  
    12981285$(eval $(call BuildPackage,luci-core)) 
    12991286$(eval $(call BuildPackage,luci-fastindex)) 
    1300 $(eval $(call BuildPackage,luci-http)) 
    13011287$(eval $(call BuildPackage,luci-httpclient)) 
    13021288$(eval $(call BuildPackage,luci-ipkg))