prevent whining about conflicting targets
This commit is contained in:
parent
79e3250337
commit
7c5dbf816a
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user