[kmod bluetooth] hci_usb.c has been replaced with btusb.c in 2.6.29 - modify makefile...

[openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index f4bd07f..151cba7 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -1,20 +1,22 @@
-# 
+#

 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

+UCI_VERSION=0.7
+UCI_RELEASE=4
+

 PKG_NAME:=uci
 PKG_NAME:=uci

-PKG_VERSION:=0.1
+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_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

-PKG_MD5SUM:=f6340dce09f5f1552c4e03be98e64265
+PKG_MD5SUM:=39e46c24651e7e5c1759f3223bd299f9

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -24,7 +26,6 @@ DEBUG=
 define Package/libuci
   SECTION:=libs
   CATEGORY:=Libraries
 define Package/libuci
   SECTION:=libs
   CATEGORY:=Libraries

-  DEPENDS:=+libuci

   TITLE:=C library for the Unified Configuration Interface (UCI)
 endef
 
   TITLE:=C library for the Unified Configuration Interface (UCI)
 endef
 


@@ -35,23 +36,33 @@ define Package/uci
   TITLE:=Utility for the Unified Configuration Interface (UCI)
 endef
 
   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
 
 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)" \
                $(TARGET_CONFIGURE_OPTS) \
                COPTS="$(TARGET_CFLAGS)" \
                DEBUG="$(DEBUG)" \

-               VERSION="$(PKG_VERSION)" \
+               VERSION="$(UCI_VERSION)" \
+               CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \

                OS="Linux"
                OS="Linux"

+
+# work around a nasty gcc bug
+ifneq ($(CONFIG_GCC_VERSION_4_2_4),)
+  UCI_MAKEOPTS += WOPTS=""
+endif
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
+       $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)

 endef
 
 define Package/libuci/install
 endef
 
 define Package/libuci/install


@@ -59,17 +70,27 @@ define Package/libuci/install
        $(CP) $(PKG_BUILD_DIR)/libuci.so* $(1)/lib/
 endef
 
        $(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
 define Package/uci/install

+       $(INSTALL_DIR) $(1)/etc/uci-defaults

        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/uci $(1)/sbin/

-       $(CP) ./files/uci/* $(1)/
+       $(CP) ./files/* $(1)/

 endef
 
 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
+       $(CP) $(PKG_BUILD_DIR)/libuci.a $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libucimap.a $(1)/usr/lib

 endef
 
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))
 endef
 
 $(eval $(call BuildPackage,uci))
 $(eval $(call BuildPackage,libuci))

-$(eval $(call BuildPackage,uci-sh))
+$(eval $(call BuildPackage,libuci-lua))