Alexandre Julliard : makefiles: Generate makefiles and po rules also for disabled modules.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 13 08:34:46 CST 2015
Module: wine
Branch: master
Commit: 3042f720d87bd0590a21163f46e9ffa02595c298
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3042f720d87bd0590a21163f46e9ffa02595c298
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Nov 13 13:32:24 2015 +0900
makefiles: Generate makefiles and po rules also for disabled modules.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
aclocal.m4 | 9 ++++-----
configure | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 774377d..8e047b5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -341,11 +341,9 @@ wine_fn_disabled_rules ()
ac_extraclean="$ac_dir/Makefile"
test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore"
- 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_depend_rules
+ wine_fn_clean_rules $ac_clean
+ wine_fn_pot_rules
}
wine_fn_config_makefile ()
@@ -414,6 +412,7 @@ wine_fn_config_dll ()
then
wine_fn_depend_rules
wine_fn_clean_rules $ac_clean
+ wine_fn_pot_rules
else
wine_fn_disabled_rules $ac_clean
return
diff --git a/configure b/configure
index 4fecf62..43f6b04 100755
--- a/configure
+++ b/configure
@@ -7523,11 +7523,9 @@ wine_fn_disabled_rules ()
ac_extraclean="$ac_dir/Makefile"
test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore"
- 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_depend_rules
+ wine_fn_clean_rules $ac_clean
+ wine_fn_pot_rules
}
wine_fn_config_makefile ()
@@ -7605,6 +7603,7 @@ fi
then
wine_fn_depend_rules
wine_fn_clean_rules $ac_clean
+ wine_fn_pot_rules
else
wine_fn_disabled_rules $ac_clean
return
More information about the wine-cvs
mailing list