luci-base: add L.media() URL construction helper

[oweals/luci.git] / modules / luci-base / Makefile

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index 06ee7985ebff02b7df63694f892031b5467ac818..5019646611cdeeccba071198931c4622dcb753d3 100644 (file)
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@@ -12,15 +12,11 @@ LUCI_TYPE:=mod
 LUCI_BASENAME:=base
 
 LUCI_TITLE:=LuCI core libraries
-LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua
+LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc +liblucihttp-lua +rpcd-mod-file +rpcd-mod-luci +cgi-io
 
-
-PKG_SOURCE:=v1.0.0.tar.gz
-PKG_SOURCE_URL:=https://github.com/jirutka/luasrcdiet/archive/
-PKG_HASH:=48162e63e77d009f5848f18a5cabffbdfc867d0e5e73c6d407f6af5d6880151b
 PKG_LICENSE:=MIT
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/luasrcdiet-1.0.0
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -36,15 +32,13 @@ define Host/Configure
 endef
 
 define Host/Compile
-       $(MAKE) -C src/ clean po2lmo
+       $(MAKE) -C src/ clean po2lmo jsmin
 endef
 
 define Host/Install
        $(INSTALL_DIR) $(1)/bin
-       $(INSTALL_DIR) $(1)/lib/lua/5.1
        $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo
-       $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet
-       $(CP) $(HOST_BUILD_DIR)/luasrcdiet $(1)/lib/lua/5.1/
+       $(INSTALL_BIN) src/jsmin $(1)/bin/jsmin
 endef
 
 $(eval $(call HostBuild))