Alexandre Julliard : makefiles: Only output tools directory dependencies when tools are enabled.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 210af2e399ea4f44ceb3419f6f82f110962d9bb5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=210af2e399ea4f44ceb3419f6f...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Nov 25 15:06:05 2013 +0100

makefiles: Only output tools directory dependencies when tools are enabled.

---

 aclocal.m4 |    7 +++++--
 configure  |   15 +++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index b1315b7..d6f5790 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -343,7 +343,9 @@ wine_fn_config_lib ()
     ac_name=$[1]
     ac_flags=$[2]
     ac_dir=dlls/$ac_name
+    ac_deps="include"
 
+    AS_VAR_IF([enable_tools],[no],,[ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"])
     wine_fn_all_rules Make.rules.in
     wine_fn_clean_rules
 
@@ -356,7 +358,7 @@ $ac_dir/uninstall::
 install install-dev:: $ac_dir/install
 __uninstall__: $ac_dir/uninstall
 __builddeps__: $ac_dir
-$ac_dir: tools/widl tools/winebuild tools/winegcc include"
+$ac_dir: $ac_deps"
 }
 
 wine_fn_config_dll ()
@@ -368,9 +370,10 @@ wine_fn_config_dll ()
     ac_implib=${4:-$ac_name}
     ac_file=$ac_dir/lib$ac_implib
     ac_dll=$ac_name
-    ac_deps="tools/widl tools/winebuild tools/winegcc include"
+    ac_deps="include"
     ac_implibflags=""
 
+    AS_VAR_IF([enable_tools],[no],,[ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"])
     case $ac_name in
       *16) ac_implibflags=" -m16" ;;
       *.*) ;;
diff --git a/configure b/configure
index 8556682..680c049 100755
--- a/configure
+++ b/configure
@@ -16338,7 +16338,13 @@ wine_fn_config_lib ()
     ac_name=$1
     ac_flags=$2
     ac_dir=dlls/$ac_name
+    ac_deps="include"
 
+    if test "x$enable_tools" = xno; then :
+
+else
+  ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"
+fi
     wine_fn_all_rules Make.rules.in
     wine_fn_clean_rules
 
@@ -16351,7 +16357,7 @@ $ac_dir/uninstall::
 install install-dev:: $ac_dir/install
 __uninstall__: $ac_dir/uninstall
 __builddeps__: $ac_dir
-$ac_dir: tools/widl tools/winebuild tools/winegcc include"
+$ac_dir: $ac_deps"
 }
 
 wine_fn_config_dll ()
@@ -16363,9 +16369,14 @@ wine_fn_config_dll ()
     ac_implib=${4:-$ac_name}
     ac_file=$ac_dir/lib$ac_implib
     ac_dll=$ac_name
-    ac_deps="tools/widl tools/winebuild tools/winegcc include"
+    ac_deps="include"
     ac_implibflags=""
 
+    if test "x$enable_tools" = xno; then :
+
+else
+  ac_deps="tools/widl tools/winebuild tools/winegcc $ac_deps"
+fi
     case $ac_name in
       *16) ac_implibflags=" -m16" ;;
       *.*) ;;