X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/61bf0e31f374b8232aaaa5916479bda14cf4ee4b..b389d9e3e65f48e64bd9a44fd8ef9c7a6f168013:/package/uci/Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 651215001..f6ec08f0e 100644
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,15 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
+UCI_VERSION=0.3
+UCI_RELEASE=4
+
 PKG_NAME:=uci
-PKG_VERSION:=0.1.2
+PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=2c1bd1b24ca3c3e565b28122f2efd047
-
-LIBVERSION=0.1
+PKG_MD5SUM:=73288ab9bd202bed27b00736d48e190d
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -43,16 +44,27 @@ define Package/uci-sh
   TITLE:=Old shell/awk implementation of UCI
 endef
 
+define Package/libuci-lua
+  SECTION=libs
+  CATEGORY=Libraries
+  DEPENDS:=+libuci +lua
+  TITLE:=Lua plugin for UCI
+endef
+
 define Build/Configure
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+UCI_MAKEOPTS = \
 		$(TARGET_CONFIGURE_OPTS) \
 		COPTS="$(TARGET_CFLAGS)" \
 		DEBUG="$(DEBUG)" \
-		VERSION="$(LIBVERSION)" \
+		VERSION="$(UCI_VERSION)" \
+		CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
 		OS="Linux"
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
+	$(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)
 endef
 
 define Package/libuci/install
@@ -60,6 +72,11 @@ define Package/libuci/install
 	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/
 endef
 
+define Package/libuci-lua/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua/5.1
+	$(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/5.1
+endef
+
 define Package/uci/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
@@ -71,6 +88,14 @@ define Package/uci-sh/install
 	$(CP) ./files/uci-sh/* $(1)/
 endef
 
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/uci{,_config}.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/usr/lib
+endef
+
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
+$(eval $(call BuildPackage,libuci-lua))
 $(eval $(call BuildPackage,uci-sh))