X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibevent%2FMakefile;h=4f16d9c12e2082d541ac9a70fd08681c96a01c7d;hp=bb6aea51c11d02ac2fbf46dab9988c25d0cf7a74;hb=fd6b9280c7b4ac16052ae9a5bd306f219b8264f1;hpb=b70e164d3e7e180c53a167daa81fd407f19a69ac

diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile
index bb6aea51c1..4f16d9c12e 100644
--- a/libs/libevent/Makefile
+++ b/libs/libevent/Makefile
@@ -1,24 +1,20 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libevent
-PKG_VERSION:=1.1
+PKG_VERSION:=1.4.12
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable.tar.gz
 PKG_SOURCE_URL:=http://www.monkey.org/~provos/
-PKG_MD5SUM:=a5bd281aeb41bdaa48fbbf0495423d20
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=77b0d8b9885496871bb083165b35ba11
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,19 +22,25 @@ define Package/libevent
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Event notification library
-  DESCRIPTION:=\
-	The libevent API provides a mechanism to execute a callback function \\\
-	when a specific event occurs on a file descriptor or after a timeout \\\
-	has been reached. Furthermore, libevent also support callbacks due \\\
-	to signals or regular timeouts.\\\
-	\\\
-	libevent is meant to replace the event loop found in event driven \\\
-	network servers. An application just needs to call event_dispatch() \\\
-	and then add or remove events dynamically without having to change \\\
-	the event loop.
   URL:=http://www.monkey.org/~provos/libevent/
 endef
 
+define Package/libevent/description
+	The libevent API provides a mechanism to execute a callback function
+	when a specific event occurs on a file descriptor or after a timeout
+	has been reached. Furthermore, libevent also support callbacks due
+	to signals or regular timeouts.
+
+	libevent is meant to replace the event loop found in event driven
+	network servers. An application just needs to call event_dispatch()
+	and then add or remove events dynamically without having to change
+	the event loop.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+Hooks/InstallDev/Post += libtool_fixup_libdir
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
@@ -49,23 +51,16 @@ MAKE_FLAGS += \
 	all install
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/event.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{a,so} $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so* $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/event.h \
-		$(STAGING_DIR)/usr/lib/libevent.{a,so} \
-		$(STAGING_DIR)/usr/lib/libevent-$(PKG_VERSION).so*
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{la,a,so} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so* $(1)/usr/lib/
 endef
 
 define Package/libevent/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libevent))