configure: Disable clean and depend rules for disabled top-level directories.

This commit is contained in:
Alexandre Julliard 2010-06-30 17:34:20 +02:00
parent 43ed0c177c
commit 9bdd0272ce
2 changed files with 8 additions and 8 deletions

7
aclocal.m4 vendored
View File

@ -183,9 +183,10 @@ wine_fn_config_makefile ()
{
ac_dir=$[1]
ac_enable=$[2]
wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
AS_VAR_IF([$ac_enable],[no],[return 0])
AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile dummy
@ -197,7 +198,7 @@ install-lib:: $ac_dir
install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install-dev
uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall"])
@cd $ac_dir && \$(MAKE) uninstall"
}
wine_fn_config_lib ()

9
configure vendored
View File

@ -13989,13 +13989,13 @@ wine_fn_config_makefile ()
{
ac_dir=$1
ac_enable=$2
wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
eval as_val=\$$ac_enable
if test "x$as_val" = x""no; then :
return 0
fi
else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile dummy
@ -14008,7 +14008,6 @@ install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install-dev
uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall"
fi
}
wine_fn_config_lib ()