Add missing dependecy on xbitmaps to xsetroot.

[openwrt/svn-archive/archive.git] / XOrg / app / xsetroot / Makefile

diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile
index 8dec11e1ce855517eb79090fa19369e56645a59a..6a39b4f4418379dd6c63515250a27be2b7bcdcd6 100644 (file)
--- a/XOrg/app/xsetroot/Makefile
+++ b/XOrg/app/xsetroot/Makefile
@@ -1,62 +1,44 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=xsetroot
 PKG_NAME:=xsetroot
-PKG_RELEASE:=1
-PKG_VERSION:=X11R7.0-1.0.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/app
+PKG_RELEASE:=2
+PKG_VERSION:=1.0.2
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 
-_DEPEND:=
+_DEPEND:= +libX11 +xbitmaps
 ifneq (xsetroot,xinit)
 _DEPEND+=xorg-server-essentials
 endif
 
 include $(INCLUDE_DIR)/package.mk
 
+TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+PKG_INSTALL=1
+
 define Package/xsetroot
   SECTION:=xorg-app
   CATEGORY:=Xorg
   SUBMENU:=app
-  DEPENDS:=${_DEPEND} @TARGET_x86
+  DEPENDS:=+libX11 +xbitmaps @DISPLAY_SUPPORT
   TITLE:=xsetroot
   URL:=http://xorg.freedesktop.org/
 endef
 
 define Build/InstallDev
-       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)  $(MAKE_FLAGS) install
-endef
-
-ifeq (xsetroot,xdm)
-CONFIGURE_ARGS+=--with-random-device=/dev/urandom
-endif
-
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" 
-
-define Build/Compile
-       make -C $(PKG_BUILD_DIR)
-       make -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-               $(CONFIGURE_VARS) \
-               $(CONFIGURE_CMD) \
-               $(CONFIGURE_ARGS_XTRA) \
-               $(CONFIGURE_ARGS) ;\
-       fi \
-       )
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
 define Package/xsetroot/install
@@ -65,10 +47,4 @@ define Package/xsetroot/install
        rm -rf $(1)/usr/man/
 endef
 
-define Package/xinit/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-       cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
 $(eval $(call BuildPackage,xsetroot))