libs: merge libs/http into libs/web

This commit is contained in:
Jo-Philipp Wich 2010-10-12 05:22:38 +00:00
parent 719fd249aa
commit b6358aaea4
5 changed files with 3 additions and 17 deletions

View file

@ -179,20 +179,10 @@ define Package/luci-fastindex/install
endef endef
define Package/luci-http
$(call Package/luci/libtemplate)
TITLE:=HTTP Protocol implementation
endef
define Package/luci-http/install
$(call Package/luci/install/template,$(1),libs/http)
endef
define Package/luci-httpclient define Package/luci-httpclient
$(call Package/luci/libtemplate) $(call Package/luci/libtemplate)
TITLE:=HTTP(S) client library TITLE:=HTTP(S) client library
DEPENDS+=+luci-http +luci-nixio DEPENDS+=+luci-web +luci-nixio
endef endef
define Package/luci-httpclient/install define Package/luci-httpclient/install
@ -244,7 +234,7 @@ endef
define Package/luci-lucid define Package/luci-lucid
$(call Package/luci/webservertemplate) $(call Package/luci/webservertemplate)
TITLE:=LuCId Full-Stack Webserver TITLE:=LuCId Full-Stack Webserver
DEPENDS+=+luci-nixio +luci-http +luci-px5g DEPENDS+=+luci-nixio +luci-web +luci-px5g
endef endef
define Package/luci-lucid/install define Package/luci-lucid/install
@ -325,7 +315,7 @@ endef
define Package/luci-web define Package/luci-web
$(call Package/luci/libtemplate) $(call Package/luci/libtemplate)
DEPENDS+=+luci-http +luci-sys +luci-nixio +luci-uci \ DEPENDS+=+luci-sys +luci-nixio +luci-uci \
+luci-sgi-cgi +luci-lmo +luci-sgi-cgi +luci-lmo
TITLE:=MVC Webframework TITLE:=MVC Webframework
$(call Config,luci.main.lang,string,auto,Default Language) $(call Config,luci.main.lang,string,auto,Default Language)
@ -1061,9 +1051,6 @@ endif
ifneq ($(CONFIG_PACKAGE_luci-fastindex),) ifneq ($(CONFIG_PACKAGE_luci-fastindex),)
PKG_SELECTED_MODULES+=libs/fastindex PKG_SELECTED_MODULES+=libs/fastindex
endif endif
ifneq ($(CONFIG_PACKAGE_luci-http),)
PKG_SELECTED_MODULES+=libs/http
endif
ifneq ($(CONFIG_PACKAGE_luci-httpclient),) ifneq ($(CONFIG_PACKAGE_luci-httpclient),)
PKG_SELECTED_MODULES+=libs/httpclient PKG_SELECTED_MODULES+=libs/httpclient
endif endif
@ -1297,7 +1284,6 @@ MAKE_FLAGS += \
$(eval $(call BuildPackage,luci-core)) $(eval $(call BuildPackage,luci-core))
$(eval $(call BuildPackage,luci-fastindex)) $(eval $(call BuildPackage,luci-fastindex))
$(eval $(call BuildPackage,luci-http))
$(eval $(call BuildPackage,luci-httpclient)) $(eval $(call BuildPackage,luci-httpclient))
$(eval $(call BuildPackage,luci-ipkg)) $(eval $(call BuildPackage,luci-ipkg))
$(eval $(call BuildPackage,luci-json)) $(eval $(call BuildPackage,luci-json))