Merge menuconfig Xorg libs and libraries section.

[openwrt/svn-archive/archive.git] / Xorg / xorg / lib / libICE / Makefile

diff --git a/Xorg/xorg/lib/libICE/Makefile b/Xorg/xorg/lib/libICE/Makefile
index a1e1070adf8e9ea0b38a5212861f96f5992bac58..2162135c9efdf4374c8788bb05472bd415e903d4 100644 (file)
--- a/Xorg/xorg/lib/libICE/Makefile
+++ b/Xorg/xorg/lib/libICE/Makefile
@@ -8,42 +8,46 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libICE
 PKG_NAME:=libICE
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 PKG_VERSION:=1.0.4
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=xproto
+PKG_MD5SUM:=4ab4e67e0b8845aa201e984153087f4a
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=xproto xtrans
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libICE
   SECTION:=xorg-lib
   CATEGORY:=Xorg
-  SUBMENU:=lib
-  DEPENDS:=+xtrans
+  SUBMENU:=libraries
   TITLE:=libICE
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/ICE}
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/ICE/* \
+               $(1)/usr/include/X11/ICE/
 endef
 
 define Package/libICE/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libICE))