[packages] apr: ditch shipped libtool, make it non-silent

[openwrt/svn-archive/archive.git] / libs / libIDL2 / Makefile

diff --git a/libs/libIDL2/Makefile b/libs/libIDL2/Makefile
index 52b8f6c8ce9aa48f62d1f9caffcd57d50457e606..20564877abbe55fdcbe3c803dc9157523dad35f2 100644 (file)
--- a/libs/libIDL2/Makefile
+++ b/libs/libIDL2/Makefile
@@ -4,33 +4,26 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libIDL2
-PKG_VERSION:=0.8.11
+PKG_VERSION:=0.8.13
 PKG_RELEASE:=1
 
 PKG_SOURCE:=libIDL-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/libIDL-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/libIDL-$(PKG_VERSION)
 PKG_SOURCE_URL:=@GNOME/libIDL/0.8
-PKG_MD5SUM:=9d0d4895fc23f7de9514fb13f0fdc9ba
+PKG_MD5SUM:=b43b289a859eb38a710f70622c46e571
 PKG_FIXUP:=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
+HOST_BUILD_DEPENDS:=glib2/host
 PKG_INSTALL=1
 
-TARGET_CFLAGS += \
-       -I$(STAGING_DIR)/usr/lib/libintl/include \
-       -I$(STAGING_DIR)/usr/libiconv/include
-
-TARGET_LDFLAGS += \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libIDL2
   SECTION:=libs
@@ -51,32 +44,28 @@ define Build/Configure
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(2)/bin
-       $(INSTALL_BIN) \
-               $(PKG_INSTALL_DIR)/usr/bin/libIDL-config-2 \
-               $(2)/bin
-
-       $(INSTALL_DIR) $(1)/usr/include/libIDL-2.0/libIDL/
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/include/libIDL-2.0/libIDL/*.h \
-               $(1)/usr/include/libIDL-2.0/libIDL/
-
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
                $(1)/usr/lib/
 
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
        $(INSTALL_DATA) \
                $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
                $(1)/usr/lib/pkgconfig/
+
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/* \
+               $(1)/usr/include/
 endef
 
 define Package/libIDL2/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a} \
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
                $(1)/usr/lib/
 endef
 
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,libIDL2))