bzip2: moved to github

[packages.git] / libs / expat / Makefile

diff --git a/libs/expat/Makefile b/libs/expat/Makefile
index ba47bf6..8d467e1 100644 (file)
--- a/libs/expat/Makefile
+++ b/libs/expat/Makefile
@@ -1,23 +1,30 @@
-# 
+#
 # 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:=expat
-PKG_VERSION:=1.95.8
+PKG_VERSION:=2.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=aff487543845a82fe262e6e2922b4c8e
+PKG_MD5SUM:=dd7dab7a5fea97d2a6a43f511449b7cd
 PKG_SOURCE_URL:=@SF/expat
 
-include $(INCLUDE_DIR)/package.mk
+PKG_LICENSE:=MIT
+PACKAGE_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=conftools/libtool.m4
+
+PKG_BUILD_PARALLEL:=1
 
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/libexpat
   SECTION:=libs
@@ -31,40 +38,31 @@ define Package/libexpat/description
 endef
 
 
-PKG_CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
+TARGET_CFLAGS += $(FPIC)
 
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static
 
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
+define Build/Compile
+       +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) all
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+define Host/Install
+       $(MAKE) -C $(HOST_BUILD_DIR) install
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/expat{,_external}.h $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/expat{,_external}.h \
-               $(STAGING_DIR)/usr/lib/libexpat.{a,so*}
-endef
-
-
 define Package/libexpat/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
 endef
 
-
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,libexpat))
-