Skip to content

W
wine-winehq
Commit a0b8fa9f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

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

parent 49c31e3b
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 20 deletions
aclocal.m4
View file @ a0b8fa9f
...@@ -204,9 +204,10 @@ wine_fn_config_makefile () ...@@ -204,9 +204,10 @@ wine_fn_config_makefile ()
ac_dir=$[1] ac_dir=$[1]
ac_enable=$[2] ac_enable=$[2]
ac_flags=$[3] ac_flags=$[3]
ac_rules=$[4]
AS_VAR_IF([$ac_enable],[no],[return 0]) 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 \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir "all: $ac_dir
.PHONY: $ac_dir .PHONY: $ac_dir
...@@ -241,15 +242,9 @@ wine_fn_config_lib () ...@@ -241,15 +242,9 @@ wine_fn_config_lib ()
ac_name=$[1] ac_name=$[1]
ac_flags=$[2] ac_flags=$[2]
ac_dir=dlls/$ac_name ac_dir=dlls/$ac_name
wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
"all __builddeps__: $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
$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_dll () wine_fn_config_dll ()
......
configure
View file @ a0b8fa9f
...@@ -14569,11 +14569,12 @@ wine_fn_config_makefile () ...@@ -14569,11 +14569,12 @@ wine_fn_config_makefile ()
ac_dir=$1 ac_dir=$1
ac_enable=$2 ac_enable=$2
ac_flags=$3 ac_flags=$3
ac_rules=$4
if eval test \"x\$"$ac_enable"\" = x"no"; then : if eval test \"x\$"$ac_enable"\" = x"no"; then :
return 0 return 0
fi 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 \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir "all: $ac_dir
.PHONY: $ac_dir .PHONY: $ac_dir
...@@ -14608,15 +14609,9 @@ wine_fn_config_lib () ...@@ -14608,15 +14609,9 @@ wine_fn_config_lib ()
ac_name=$1 ac_name=$1
ac_flags=$2 ac_flags=$2
ac_dir=dlls/$ac_name ac_dir=dlls/$ac_name
wine_fn_all_dir_rules $ac_dir dlls/Makeimplib.rules wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir"
"all __builddeps__: $ac_dir wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include"
$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_dll () wine_fn_config_dll ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment