Alexandre Julliard : makefiles: Generate makefiles and po rules only for disabled dlls.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Nov 17 09:57:48 CST 2015
Module: wine
Branch: master
Commit: 480e95ae97f298d2e894a3a943617f88703676fd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=480e95ae97f298d2e894a3a943617f88703676fd
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Nov 17 18:05:28 2015 +0900
makefiles: Generate makefiles and po rules only for disabled dlls.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
aclocal.m4 | 10 ++++++----
configure | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index d5a3532..1cd7d1d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -330,9 +330,11 @@ wine_fn_disabled_rules ()
ac_extraclean="$ac_dir/Makefile"
test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore"
- wine_fn_depend_rules
- wine_fn_clean_rules $ac_clean
- wine_fn_pot_rules
+ wine_fn_append_rule \
+"__clean__: $ac_dir/clean
+.PHONY: $ac_dir/clean
+$ac_dir/clean: dummy
+ \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean"
}
wine_fn_config_makefile ()
@@ -397,7 +399,7 @@ wine_fn_config_dll ()
AS_VAR_IF([$ac_enable],[no],
dnl enable_win16 is special in that it disables import libs too
- [if wine_fn_has_flag implib && test "$ac_enable" != enable_win16
+ [if test "$ac_enable" != enable_win16
then
wine_fn_depend_rules
wine_fn_clean_rules $ac_clean
diff --git a/configure b/configure
index b8504ec..72355f2 100755
--- a/configure
+++ b/configure
@@ -7520,9 +7520,11 @@ wine_fn_disabled_rules ()
ac_extraclean="$ac_dir/Makefile"
test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore"
- wine_fn_depend_rules
- wine_fn_clean_rules $ac_clean
- wine_fn_pot_rules
+ wine_fn_append_rule \
+"__clean__: $ac_dir/clean
+.PHONY: $ac_dir/clean
+$ac_dir/clean: dummy
+ \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean"
}
wine_fn_config_makefile ()
@@ -7596,7 +7598,7 @@ fi
test -n "$DLLEXT" || ac_clean="$ac_clean $ac_dir/$ac_dll"
if eval test \"x\$"$ac_enable"\" = x"no"; then :
- if wine_fn_has_flag implib && test "$ac_enable" != enable_win16
+ if test "$ac_enable" != enable_win16
then
wine_fn_depend_rules
wine_fn_clean_rules $ac_clean
More information about the wine-cvs
mailing list