diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-12 05:15:32 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-12 05:15:32 +0000 |
| commit | ede4aca4b95c9e664e4830fd43c54b627b122538 (patch) | |
| tree | 4b76e082d3968c1171fcc74412bf58fa852e3d42 /contrib/package | |
| parent | 7b23839dce0c09953142a5af946ab642027bc3c5 (diff) | |
libs: merge libs/cbi into libs/web
Diffstat (limited to 'contrib/package')
| -rw-r--r-- | contrib/package/luci/Makefile | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index dcc2c3c3b3..4fe804b54c 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -158,17 +158,6 @@ endif ### Libraries ### -define Package/luci-cbi - $(call Package/luci/libtemplate) - DEPENDS+=+luci-web +luci-uci - TITLE:=Configuration Binding Interface -endef - -define Package/luci-cbi/install - $(call Package/luci/install/template,$(1),libs/cbi) -endef - - define Package/luci-uci $(call Package/luci/libtemplate) DEPENDS+=+libuci-lua @@ -396,7 +385,7 @@ endef define Package/luci-admin-core $(call Package/luci/webtemplate) - DEPENDS+=+luci-web +luci-cbi +luci-i18n-english + DEPENDS+=+luci-web +luci-i18n-english TITLE:=Web UI Core Module endef @@ -1079,9 +1068,6 @@ endef ifneq ($(CONFIG_PACKAGE_luci-core),) PKG_SELECTED_MODULES+=libs/core endif -ifneq ($(CONFIG_PACKAGE_luci-cbi),) - PKG_SELECTED_MODULES+=libs/cbi -endif ifneq ($(CONFIG_PACKAGE_luci-fastindex),) PKG_SELECTED_MODULES+=libs/fastindex endif @@ -1323,7 +1309,6 @@ MAKE_FLAGS += \ $(eval $(call BuildPackage,luci-core)) -$(eval $(call BuildPackage,luci-cbi)) $(eval $(call BuildPackage,luci-fastindex)) $(eval $(call BuildPackage,luci-http)) $(eval $(call BuildPackage,luci-httpclient)) |