Alexandre Julliard : makefiles: Still generate makefile rule for disabled dlls that have an import lib.

Alexandre Julliard julliard at winehq.org
Tue Jul 26 11:37:53 CDT 2011


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jul 25 22:05:51 2011 +0200

makefiles: Still generate makefile rule for disabled dlls that have an import lib.

---

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

diff --git a/aclocal.m4 b/aclocal.m4
index 83ed0ad..948dd7f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -290,7 +290,9 @@ wine_fn_config_dll ()
 
     AS_VAR_IF([$ac_enable],[no],
               dnl enable_win16 is special in that it disables import libs too
-              [test "$ac_enable" != enable_win16 || return 0],
+              [test "$ac_enable" != enable_win16 || return 0
+               wine_fn_has_flag implib $ac_flags && wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules],
+
               [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "$ac_dir: __builddeps__
 manpages htmlpages sgmlpages xmlpages:: $ac_dir/Makefile
diff --git a/configure b/configure
index cf880f3..caad79e 100755
--- a/configure
+++ b/configure
@@ -14358,6 +14358,7 @@ wine_fn_config_dll ()
 
     if eval test \"x\$"$ac_enable"\" = x"no"; then :
                 test "$ac_enable" != enable_win16 || return 0
+               wine_fn_has_flag implib $ac_flags && wine_fn_all_dir_rules $ac_dir dlls/Makedll.rules
 else
   wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
 "$ac_dir: __builddeps__




More information about the wine-cvs mailing list