makefiles: Use the generic install flags for the static libraries.

This commit is contained in:
Alexandre Julliard 2011-06-12 12:44:03 +02:00
parent 49c31e3bf8
commit a0b8fa9f97
2 changed files with 10 additions and 20 deletions

15
aclocal.m4 vendored
View File

@ -204,9 +204,10 @@ wine_fn_config_makefile ()
ac_dir=$[1]
ac_enable=$[2]
ac_flags=$[3]
ac_rules=$[4]
AS_VAR_IF([$ac_enable],[no],[return 0])
wine_fn_all_dir_rules $ac_dir Make.rules
wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules}
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir
.PHONY: $ac_dir
@ -241,15 +242,9 @@ wine_fn_config_lib ()
ac_name=$[1]
ac_flags=$[2]
ac_dir=dlls/$ac_name
wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all __builddeps__: $ac_dir
$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd $ac_dir && \$(MAKE)
install install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install
uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall"
wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
}
wine_fn_config_dll ()

15
configure vendored
View File

@ -14569,11 +14569,12 @@ wine_fn_config_makefile ()
ac_dir=$1
ac_enable=$2
ac_flags=$3
ac_rules=$4
if eval test \"x\$"$ac_enable"\" = x"no"; then :
return 0
fi
wine_fn_all_dir_rules $ac_dir Make.rules
wine_fn_all_dir_rules $ac_dir ${ac_rules:-Make.rules}
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir
.PHONY: $ac_dir
@ -14608,15 +14609,9 @@ wine_fn_config_lib ()
ac_name=$1
ac_flags=$2
ac_dir=dlls/$ac_name
wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all __builddeps__: $ac_dir
$ac_dir: $ac_dir/Makefile tools/widl tools/winebuild tools/winegcc include dummy
@cd $ac_dir && \$(MAKE)
install install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install
uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall"
wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
}
wine_fn_config_dll ()