X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibjson-c%2FMakefile;h=afd409b8e94142b653ff7ae9d669d6926c6574e5;hb=63a40ca6bdc96e62ea728f3809ff8bc00b914110;hp=0180d5951cbd878f39ad518c581661de8b2be092;hpb=2c438cfdf236e2479552682c098e174226e0935b;p=openwrt-10.03%2F.git

diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index 0180d5951..afd409b8e 100644
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -1,52 +1,45 @@
-# 
-# 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
   TITLE:=javascript object notation
-  DESCRIPTION:=library for javascript object notation backends
   URL:=http://oss.metaparadigm.com/json-c/
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+define Package/libjson/description
+ This package contains a library for javascript object notation backends.
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) -r $(PKG_INSTALL_DIR)/usr/include/json $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/libjson.{a,so*} $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(STAGING_DIR)/usr/lib/pkgconfig/
-	$(SED) 's,-I$$$${includedir}/,-I$(STAGING_DIR)/usr/include/,g' $(STAGING_DIR)/usr/lib/pkgconfig/json.pc
-	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/json.pc
-endef
-
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/json \
-		$(STAGING_DIR)/usr/lib/libjson.{a,so*} \
-		$(STAGING_DIR)/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