ath9k: add some more fixes to the mic failure handling rework patch

[openwrt.git] / package / libjson-c / Makefile

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index c2adc7c..afd409b 100644 (file)
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -1,23 +1,27 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id: Makefile 6643 2007-03-23 08:11:08Z nico $

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=json-c
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=json-c

-PKG_VERSION:=0.7
-PKG_RELEASE:=1
+PKG_VERSION:=0.9
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://oss.metaparadigm.com/json-c/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://oss.metaparadigm.com/json-c/

-PKG_MD5SUM:=
+PKG_MD5SUM:=3a13d264528dcbaf3931b0cede24abae
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1

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

+TARGET_CFLAGS += $(FPIC)
+

 define Package/libjson
   SECTION:=libs
   CATEGORY:=Libraries
 define Package/libjson
   SECTION:=libs
   CATEGORY:=Libraries


@@ -29,27 +33,13 @@ define Package/libjson/description
  This package contains a library for javascript object notation backends.
 endef
 
  This package contains a library for javascript object notation backends.
 endef
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-

 define Build/InstallDev
 define Build/InstallDev

-       mkdir -p $(1)/usr/include
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
-       $(SED) 's,-I$$$${includedir}/,-I$(1)/usr/include/,g' $(1)/usr/lib/pkgconfig/json.pc
-       $(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/json.pc
-endef
-
-define Build/UninstallDev
-       rm -rf  $(1)/usr/include/json \
-               $(1)/usr/lib/libjson.{a,so*} \
-               $(1)/usr/lib/pkgconfig/json.pc
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/

 endef
 
 define Package/libjson/install
 endef
 
 define Package/libjson/install