diff options
| author | Eric Andersen <andersen@codepoet.org> | 2005-06-24 09:39:45 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2005-06-24 09:39:45 +0000 |
| commit | 7c5dbf816a60f571507efcf31e61704a5ecabaf6 (patch) | |
| tree | 9b5c9a9685dbc191f26f327e45ca3bc5353f820b | |
| parent | 79e325033716baee9150d6907fb78fc461043518 (diff) | |
prevent whining about conflicting targets
| -rw-r--r-- | package/tinyx/tinyx.mk | 7 | ||||
| -rw-r--r-- | package/xorg/xorg.mk | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index efdf20d3a..29972ee53 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -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 diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index 01a12739a..59a6b76df 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -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 |