[package] ucmb uses an incompatible spi_gpio_platform_data with kernels before 2...

[openwrt/svn-archive/archive.git] / utils / owfs / Makefile

diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile
index 87e4096361a28ac7d8e5b2a828a77304f4855359..27cdb803a26c391bca5df7c3b3988eb5032887d9 100644 (file)
--- a/utils/owfs/Makefile
+++ b/utils/owfs/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -7,12 +7,12 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=owfs
-PKG_VERSION:=2.7p7
-PKG_RELEASE:=2
+PKG_VERSION:=2.7p13
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=4c189f64a1a6110bef19639a36c3b0e1
+PKG_MD5SUM:=285483508f7fa42af3500b04f792058c
 
 PKG_FIXUP = libtool
 
@@ -30,7 +30,7 @@ endef
 
 define Package/owfs/Server
   $(call Package/owfs/Default)
-  DEPENDS:=+owfs
+  DEPENDS:=+libow +libpthread
   SECTION:=net
   CATEGORY:=Network
 endef
@@ -142,7 +142,7 @@ define Build/Configure
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib" \
                lt_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
                lt_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
                shrext_cmds=".so" \
@@ -161,16 +161,13 @@ define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/{owcapi,owfs_config}.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libow.{a,so} $(PKG_INSTALL_DIR)/usr/lib/libowcapi.{a,so} $(STAGING_DIR)/usr/lib/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libow-*.so.* $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so.* $(STAGING_DIR)/usr/lib/
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libow-*.so* $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so* $(STAGING_DIR)/usr/lib/
 endef
 
 define Build/UninstallDev
        rm -rf  $(STAGING_DIR)/usr/include/{libow-capi,owfs_config}.h \
-               $(STAGING_DIR)/usr/lib/libow-capi-*.so.* \
-               $(STAGING_DIR)/usr/lib/libow-*.so.* \
-               $(STAGING_DIR)/usr/lib/libow-capi.{a,so} \
-               $(STAGING_DIR)/usr/lib/libow.{a,so}
+               $(STAGING_DIR)/usr/lib/libow-capi-*.so* \
+               $(STAGING_DIR)/usr/lib/libow-*.so*
 endef
 
 
@@ -203,12 +200,12 @@ endef
 
 define Package/libow/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libow-*.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libow-*.so.* $(1)/usr/lib/
 endef
 
 define Package/libow-capi/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so.* $(1)/usr/lib/
        #$(INSTALL_DIR) $(1)/usr/include
        #$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/include/{owcapi,owfs_config}.h $(1)/usr/include/
 endef