X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/aa1917650cef71daec89ab701308af6cfacb0c50..c291b847846f5921d669b17478cbf59f0c83ee19:/package/uci/Makefile?ds=inline diff --git a/package/uci/Makefile b/package/uci/Makefile index e16bd0ecb..c24ce04ed 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,8 +8,8 @@ include $(TOPDIR)/rules.mk -UCI_VERSION=0.2 -UCI_RELEASE=4 +UCI_VERSION=0.4 +UCI_RELEASE=8 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) @@ -17,8 +17,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.openwrt.org/sources -PKG_MD5SUM:=fb18e6b1b8bcafbec099a1783e4764ac - +PKG_MD5SUM:=1a671895bfaafe86087ce4374dfb8556 include $(INCLUDE_DIR)/package.mk @@ -38,23 +37,28 @@ define Package/uci TITLE:=Utility for the Unified Configuration Interface (UCI) endef -define Package/uci-sh - SECTION:=base - CATEGORY:=Base system - DEPENDS:=@!PACKAGE_uci - TITLE:=Old shell/awk implementation of UCI +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) \ +TARGET_CFLAGS += $(FPIC) +UCI_MAKEOPTS = \ $(TARGET_CONFIGURE_OPTS) \ COPTS="$(TARGET_CFLAGS)" \ DEBUG="$(DEBUG)" \ 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 @@ -62,17 +66,25 @@ define Package/libuci/install $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/ endef +define Package/libuci-lua/install + $(INSTALL_DIR) $(1)/usr/lib/lua + $(CP) $(PKG_BUILD_DIR)/lua/uci.so $(1)/usr/lib/lua/ +endef + define Package/uci/install + $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/ - $(CP) ./files/uci/* $(1)/ + $(CP) ./files/* $(1)/ endef -define Package/uci-sh/install - $(INSTALL_DIR) $(1) - $(CP) ./files/uci-sh/* $(1)/ +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,uci-sh)) +$(eval $(call BuildPackage,libuci-lua))