X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Flibjson-c%2FMakefile;h=afd409b8e94142b653ff7ae9d669d6926c6574e5;hb=0096aa78b267ee4c94333e53bd70bb1429a915b0;hp=bcb298418d001d1c1d98f27b1dd9daf6fa5b9ee4;hpb=4fa7250c0736bb48a1cab5c634a40b351cefdbde;p=oweals%2Fopenwrt.git

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index bcb298418d..afd409b8e9 100644
--- 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.
 #
-# $Id: Makefile 6643 2007-03-23 08:11:08Z nico $
 
 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_MD5SUM:=
+PKG_MD5SUM:=3a13d264528dcbaf3931b0cede24abae
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_CFLAGS += $(FPIC)
+
 define Package/libjson
   SECTION:=libs
   CATEGORY:=Libraries
@@ -29,27 +33,15 @@ define Package/libjson/description
  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
-	mkdir -p $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/json $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(1)/usr/lib/
-	mkdir -p $(1)/usr/lib/pkgconfig
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
 endef
 
-define Build/UninstallDev
-	rm -rf	$(1)/usr/include/json \
-		$(1)/usr/lib/libjson.{a,so*} \
-		$(1)/usr/lib/pkgconfig/json.pc
-endef
-
 define Package/libjson/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/