mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-10 00:04:06 -09:00
Code Issues Packages Projects Releases Wiki Activity

prevent whining about conflicting targets

Browse Source
This commit is contained in:
Eric Andersen
2005-06-24 09:39:45 +00:00
parent 79e3250337
commit 7c5dbf816a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/tinyx/tinyx.mk
View File

@@ -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 @@ tinyx-dirclean:
# Toplevel Makefile options
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
TARGETS+=tinyx
endif
endif

3
package/xorg/xorg.mk
View File

@@ -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 @@ xorg-dirclean:
# Toplevel Makefile options
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
TARGETS+=xorg
endif
endif