From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 31 Dec 2008 00:22:40 +0000 (+0000)
Subject: Some minor cleanups.
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=674f828add4f4bdee5f162c466e8a3db88949192

Some minor cleanups.


SVN-Revision: 13780
---

diff --git a/Xorg/lib/libxcb/Makefile b/Xorg/lib/libxcb/Makefile
index 5e2447ad15..590bf26b0b 100644
--- a/Xorg/lib/libxcb/Makefile
+++ b/Xorg/lib/libxcb/Makefile
@@ -14,24 +14,15 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/
-PKG_MD5SUM:=
+PKG_MD5SUM:=9310b02433273d75d42f10da3c7455aa
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=xcbproto libpthread-stubs
 
 include $(INCLUDE_DIR)/package.mk
 
-
-TARGET_CFLAGS+=\
-	-I$(STAGING_DIR)/usr/lib/libintl/include/
-
-EXTRA_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_libxcb CONFIG_PACKAGE_gtk-cups2)
-
 PROTOS:=composite damage dpms glx randr record render res screensaver shape \
-		shm sync xevie xf86dri xfixes xinerama xprint xtest xvmc xv
+        shm sync xevie xf86dri xfixes xinerama xprint xtest xvmc xv
 
 define Package/libxcb
   SECTION:=xorg-libs
@@ -50,7 +41,7 @@ define Package/libxcb-xlib
   SECTION:=xorg-libs
   CATEGORY:=Xorg
   SUBMENU:=lib
-  TITLE:=libxcb-proto
+  TITLE:=libxcb-xlib
   DEPENDS:=+libxcb
 endef
 
@@ -88,7 +79,7 @@ define Package/libxcb/install
 		$(1)/usr/lib/
 endef
 
-define Package/libxcb/install
+define Package/libxcb-xlib/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DATA) \
 		$(PKG_INSTALL_DIR)/usr/lib/libxcb-xlib.so* \
@@ -106,7 +97,6 @@ endef
 
 $(foreach proto,$(PROTOS),$(eval $(call Package/libxcb-proto/install/Default,$(proto))))
 
-
 $(eval $(call BuildPackage,libxcb))
 $(eval $(call BuildPackage,libxcb-xlib))
 $(foreach proto,$(PROTOS),$(eval $(call BuildPackage,libxcb-$(proto))))
diff --git a/Xorg/lib/xcbproto/Makefile b/Xorg/lib/xcbproto/Makefile
index 0ee335e5f7..c78bd420a1 100644
--- a/Xorg/lib/xcbproto/Makefile
+++ b/Xorg/lib/xcbproto/Makefile
@@ -14,32 +14,16 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/
-PKG_MD5SUM:=
-PKG_FIXUP:=libtool
+PKG_MD5SUM:=d9275a714e83ab9c1f9b260c6eff1609
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-
-TARGET_CFLAGS+=\
-	-I$(STAGING_DIR)/usr/lib/libintl/include/
-
-EXTRA_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-
-STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_xcbproto CONFIG_PACKAGE_gtk-cups2)
-
 define Package/xcbproto
   SECTION:=xorg-libs
   CATEGORY:=Xorg
   SUBMENU:=lib
   TITLE:=xcbproto
-  DEPENDS:=
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-	)
 endef
 
 define Build/InstallDev