Cleanup xorg/libs package makefiles:

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

diff --git a/Xorg/xorg/lib/libxkbfile/Makefile b/Xorg/xorg/lib/libxkbfile/Makefile
index daa99ce54fc0c45d72824f129b34a7052705d8f3..7eaebe9197ae87df29196ff6743ded5b2340f3c7 100644 (file)
--- a/Xorg/xorg/lib/libxkbfile/Makefile
+++ b/Xorg/xorg/lib/libxkbfile/Makefile
@@ -8,13 +8,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libxkbfile
 PKG_NAME:=libxkbfile
-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:=0726a845fe5a56551de2718c9f6b0e35
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=kbproto
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,22 +31,24 @@ define Package/libxkbfile
   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/extensions}
+       $(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/extensions/* \
+               $(1)/usr/include/X11/extensions/
 endef
 
 define Package/libxkbfile/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libxkbfile))