Cleanup xorg/libs package makefiles:

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

diff --git a/Xorg/xorg/lib/libXt/Makefile b/Xorg/xorg/lib/libXt/Makefile
index 6fb26618f2f5876868f4e58e09df0f7cb1ae4814..d5566996bc831b3d8b27dce8a08829ec1f2bf3a4 100644 (file)
--- a/Xorg/xorg/lib/libXt/Makefile
+++ b/Xorg/xorg/lib/libXt/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXt
 PKG_NAME:=libXt
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.0.5
+
 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_MD5SUM:=f3bdd67785ace8cd0b23249e9d8c9975
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xproto kbproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,36 @@ define Package/libXt
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+               --without-xcb \
+       )
+endef
 
 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
+       $(MAKE) -C $(PKG_BUILD_DIR)/util HOSTCC=$(HOSTCC)
+       $(call Build/Compile/Default)
 endef
 
-define Package/libXt/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/}
+       $(INSTALL_DATA) \
+               $(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/* \
+               $(1)/usr/include/X11/
 endef
 
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+define Package/libXt/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXt))