Cleanup xorg/libs package makefiles:

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

diff --git a/Xorg/xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile
index 7cac1fb85b074ebc3dc9e2a19c29a15dabd05961..08290e5b502ef335a8306ff6676c9c255eeddf1e 100644 (file)
--- a/Xorg/xorg/lib/libX11/Makefile
+++ b/Xorg/xorg/lib/libX11/Makefile
@@ -10,43 +10,65 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libX11
 PKG_NAME:=libX11
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_VERSION:=1.1.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_BUILD_DEPENDS:=bigreqsproto xproto xextproto xcmiscproto xf86bigfontproto \
-                   kbproto inputproto
-
+PKG_MD5SUM:=d1512d65dadd4f48c779d4749e7753a8
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=xproto xextproto xf86bigfontproto kbproto inputproto \
+                   xtrans xcmiscproto bigreqsproto
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 define Package/libX11
   SECTION:=xorg-lib
   CATEGORY:=Xorg
   SUBMENU:=lib
-  DEPENDS:=+xtrans +libXdmcp +libXau
+  DEPENDS:=+libXdmcp +libXau
   TITLE:=libX11
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
-EXTRA_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --enable-malloc0returnsnull \
+               --enable-xf86bigfont \
+               --without-xcb \
+               --without-launchd \
+       )
+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
+       $(MAKE) -C $(PKG_BUILD_DIR)/src/util HOSTCC=$(HOSTCC)
+       $(call Build/Compile/Default)
 endef
 
-define Package/libX11/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so,a}* $(1)/usr/lib/
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \
+               $(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/libX11/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libX11))