summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <abdoulaye.gaye@supmeca.fr>2010-03-08 17:30:01 +0100
committerAbdoulaye Walsimou Gaye <abdoulaye.gaye@supmeca.fr>2010-03-08 17:30:01 +0100
commit43581c2afb2c411f5720f1ee3c3952baa644d4b5 (patch)
tree948f2aa55b85d1143ba36b1db44b8b09b62fe7e0
parent9ad8e50fd55e3f6360b2f39447be149559f224db (diff)
downloadembtoolkit-43581c2afb2c411f5720f1ee3c3952baa644d4b5.tar.gz
embtoolkit-43581c2afb2c411f5720f1ee3c3952baa644d4b5.tar.bz2
embtoolkit-43581c2afb2c411f5720f1ee3c3952baa644d4b5.tar.xz
Packages: xcb-demo: remove it as it does not build
Signed-off-by: Abdoulaye Walsimou Gaye <abdoulaye.gaye@supmeca.fr>
-rw-r--r--packages/x11/x11.kconfig1
-rw-r--r--packages/x11/x11.mk5
-rw-r--r--packages/x11/xcbdemo/xcbdemo.kconfig43
-rw-r--r--packages/x11/xcbdemo/xcbdemo.mk100
4 files changed, 0 insertions, 149 deletions
diff --git a/packages/x11/x11.kconfig b/packages/x11/x11.kconfig
index 4d3f686..c97b00d 100644
--- a/packages/x11/x11.kconfig
+++ b/packages/x11/x11.kconfig
@@ -60,7 +60,6 @@ source packages/x11/libxrender/libxrender.kconfig
endmenu
menu "X windowing system application packages"
-source packages/x11/xcbdemo/xcbdemo.kconfig
source packages/x11/xkeyboardconfig/xkeyboardconfig.kconfig
source packages/x11/xkbcomp/xkbcomp.kconfig
source packages/x11/xtrans/xtrans.kconfig
diff --git a/packages/x11/x11.mk b/packages/x11/x11.mk
index 06fb43c..dc624df 100644
--- a/packages/x11/x11.mk
+++ b/packages/x11/x11.mk
@@ -164,11 +164,6 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBXRENDER) += libxrender_install
#########################################
# X windowing system application packages
#########################################
-#xcbdemo
-include $(EMBTK_ROOT)/packages/x11/xcbdemo/xcbdemo.mk
-ROOTFS_COMPONENTS_CLEAN += xcbdemo_clean
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_XCBDEMO) += xcbdemo_install
-
#xkbcomp
include $(EMBTK_ROOT)/packages/x11/xkbcomp/xkbcomp.mk
ROOTFS_COMPONENTS_CLEAN += xkbcomp_clean
diff --git a/packages/x11/xcbdemo/xcbdemo.kconfig b/packages/x11/xcbdemo/xcbdemo.kconfig
deleted file mode 100644
index ce53187..0000000
--- a/packages/x11/xcbdemo/xcbdemo.kconfig
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved.
-#
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-################################################################################
-#
-# \file xcbdemo.kconfig
-# \brief xcbdemo.kconfig of Embtoolkit
-# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# \date March 2010
-################################################################################
-
-config EMBTK_HAVE_XCBDEMO
- bool "Have xcbdemo"
- select EMBTK_HAVE_XCBUTIL
- help
- X C binding (xcb) demo applications
-choice
- prompt "xcbdemo version you wish"
- depends on EMBTK_HAVE_XCBDEMO
- help
- Here you can choose which version of xcbdemo you want to use.
-
- config EMBTK_XCBDEMO_VERSION_0_1
- bool "xcb-demo-0.1"
-endchoice
-
-config EMBTK_XCBDEMO_VERSION_STRING
- string
- default "0.1" if EMBTK_XCBDEMO_VERSION_0_1
-
diff --git a/packages/x11/xcbdemo/xcbdemo.mk b/packages/x11/xcbdemo/xcbdemo.mk
deleted file mode 100644
index cbac5ab..0000000
--- a/packages/x11/xcbdemo/xcbdemo.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-################################################################################
-# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2010 GAYE Abdoulaye Walsimou. All rights reserved.
-#
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-################################################################################
-#
-# \file xcbdemo.mk
-# \brief xcbdemo.mk of Embtoolkit
-# \author GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# \date March 2010
-################################################################################
-
-XCBDEMO_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XCBDEMO_VERSION_STRING)))
-XCBDEMO_SITE := http://xcb.freedesktop.org/dist
-XCBDEMO_PACKAGE := xcb-demo-$(XCBDEMO_VERSION).tar.bz2
-XCBDEMO_BUILD_DIR := $(PACKAGES_BUILD)/xcb-demo-$(XCBDEMO_VERSION)
-
-XCBDEMO_BINS =
-XCBDEMO_SBINS =
-XCBDEMO_INCLUDES =
-XCBDEMO_LIBS =
-XCBDEMO_PKGCONFIGS =
-
-XCBDEMO_DEPS = xcbutil_install
-
-xcbdemo_install: $(XCBDEMO_BUILD_DIR)/.installed
-
-$(XCBDEMO_BUILD_DIR)/.installed: download_xcbdemo \
- $(XCBDEMO_BUILD_DIR)/.decompressed $(XCBDEMO_BUILD_DIR)/.configured
- $(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
- xcbdemo-$(XCBDEMO_VERSION) in your root filesystem...")
- $(Q)$(MAKE) -C $(XCBDEMO_BUILD_DIR) $(J)
- $(Q)$(MAKE) -C $(XCBDEMO_BUILD_DIR) DESTDIR=$(SYSROOT)/testxcbdemo install
- $(Q)$(MAKE) libtool_files_adapt
- $(Q)$(MAKE) pkgconfig_files_adapt
- @touch $@
-
-download_xcbdemo:
- $(call EMBTK_GENERIC_MESSAGE,"Downloading $(XCBDEMO_PACKAGE) \
- if necessary...")
- @test -e $(DOWNLOAD_DIR)/$(XCBDEMO_PACKAGE) || \
- wget -O $(DOWNLOAD_DIR)/$(XCBDEMO_PACKAGE) \
- $(XCBDEMO_SITE)/$(XCBDEMO_PACKAGE)
-
-$(XCBDEMO_BUILD_DIR)/.decompressed:
- $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XCBDEMO_PACKAGE) ...")
- @tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(XCBDEMO_PACKAGE)
- @touch $@
-
-$(XCBDEMO_BUILD_DIR)/.configured:
- $(Q)cd $(XCBDEMO_BUILD_DIR); \
- CC=$(TARGETCC_CACHED) \
- CXX=$(TARGETCXX_CACHED) \
- AR=$(TARGETAR) \
- RANLIB=$(TARGETRANLIB) \
- AS=$(CROSS_COMPILE)as \
- LD=$(TARGETLD) \
- NM=$(TARGETNM) \
- STRIP=$(TARGETSTRIP) \
- OBJDUMP=$(TARGETOBJDUMP) \
- OBJCOPY=$(TARGETOBJCOPY) \
- CFLAGS="$(TARGET_CFLAGS) -I$(SYSROOT)/usr/include -I$(SYSROOT)/usr/include/xcb" \
- CXXFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
- CPPFLGAS="-I$(SYSROOT)/usr/include -I$(SYSROOT)/usr/include/xcb" \
- PKG_CONFIG=$(PKGCONFIG_BIN) \
- PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
- ./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
- --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \
- --prefix=/usr
- @touch $@
-
-xcbdemo_clean:
- $(call EMBTK_GENERIC_MESSAGE,"cleanup xcbdemo-$(XCBDEMO_VERSION)...")
- $(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(XCBDEMO_BINS)
- $(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(XCBDEMO_SBINS)
- $(Q)-cd $(SYSROOT)/usr/include; rm -rf $(XCBDEMO_INCLUDES)
- $(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(XCBDEMO_LIBS)
- $(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(XCBDEMO_PKGCONFIGS)
-
-$(XCBDEMO_BUILD_DIR)/.x11patch:
- @XCBDEMO_C_FILES=`find $(XCBDEMO_BUILD_DIR)/tests -type f`; \
- for i in $$XCBDEMO_C_FILES; \
- do \
- sed \
- -i "s;X11/XCB/;;g" $$i; \
- done
-