[uClibc-cvs] svn commit: trunk/buildroot/package: tinyx xorg
andersen at uclibc.org
andersen at uclibc.org
Fri Jun 24 09:39:46 UTC 2005
Author: andersen
Date: 2005-06-24 03:39:45 -0600 (Fri, 24 Jun 2005)
New Revision: 10582
Log:
prevent whining about conflicting targets
Modified:
trunk/buildroot/package/tinyx/tinyx.mk
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/tinyx/tinyx.mk
===================================================================
--- trunk/buildroot/package/tinyx/tinyx.mk 2005-06-24 09:10:06 UTC (rev 10581)
+++ trunk/buildroot/package/tinyx/tinyx.mk 2005-06-24 09:39:45 UTC (rev 10582)
@@ -20,6 +20,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
+
+
+ifneq ($(strip $(BR2_PACKAGE_XORG)),y)
+ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
+
#############################################################
# You may want to change these.
#############################################################
@@ -137,6 +142,6 @@
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
TARGETS+=tinyx
endif
+endif
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2005-06-24 09:10:06 UTC (rev 10581)
+++ trunk/buildroot/package/xorg/xorg.mk 2005-06-24 09:39:45 UTC (rev 10582)
@@ -5,6 +5,7 @@
#############################################################
ifneq ($(strip $(BR2_PACKAGE_TINYX)),y)
+ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
XORG_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap
#xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \
@@ -90,8 +91,6 @@
# Toplevel Makefile options
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
TARGETS+=xorg
endif
-
endif
More information about the uClibc-cvs
mailing list