ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Build the import libraries without recursing when possible.

This commit is contained in:
Alexandre Julliard 2010-07-26 21:06:28 +02:00
parent a070f9b038
commit b0e48e1e2b
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
aclocal.m4 vendored
View File

@ -224,6 +224,11 @@ wine_fn_config_dll ()
ac_implibsrc=$[4] ac_implibsrc=$[4]
ac_file="dlls/$ac_dir/lib$ac_implib" ac_file="dlls/$ac_dir/lib$ac_implib"
ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_deps="tools/widl tools/winebuild tools/winegcc include"
ac_implibflags=""
case $ac_dir in
*16) ac_implibflags=" -m16" ;;
esac
wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
@ -265,16 +270,18 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps $ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
install-dev:: dlls/$ac_dir/Makefile __builddeps__ install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev" @cd dlls/$ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
fi fi
if test "$ac_dir" != "$ac_implib" if test "$ac_dir" != "$ac_implib"
@ -390,7 +397,10 @@ install-dev:: $ac_dir
all __tooldeps__: $ac_dir all __tooldeps__: $ac_dir
.PHONY: $ac_dir .PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile libs/port dummy $ac_dir: $ac_dir/Makefile libs/port dummy
@cd $ac_dir && \$(MAKE)"]) @cd $ac_dir && \$(MAKE)"
case $ac_dir in
tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
esac])
} }
wine_fn_config_makerules () wine_fn_config_makerules ()

18
configure vendored
View File

@ -14091,6 +14091,11 @@ wine_fn_config_dll ()
ac_implibsrc=$4 ac_implibsrc=$4
ac_file="dlls/$ac_dir/lib$ac_implib" ac_file="dlls/$ac_dir/lib$ac_implib"
ac_deps="tools/widl tools/winebuild tools/winegcc include" ac_deps="tools/widl tools/winebuild tools/winegcc include"
ac_implibflags=""
case $ac_dir in
*16) ac_implibflags=" -m16" ;;
esac
wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)"
@ -14134,16 +14139,18 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT "__builddeps__: $ac_file.$IMPLIBEXT
$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps $ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
\$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec
install-dev:: dlls/$ac_dir/Makefile __builddeps__ install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev" @cd dlls/$ac_dir && \$(MAKE) install-dev"
if test "x$CROSSTEST_DISABLE" = x if test "x$CROSSTEST_DISABLE" = x
then then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.cross.a "__builddeps__: $ac_file.cross.a
$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD)
@cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec"
fi fi
if test "$ac_dir" != "$ac_implib" if test "$ac_dir" != "$ac_implib"
@ -14270,6 +14277,9 @@ all __tooldeps__: $ac_dir
.PHONY: $ac_dir .PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile libs/port dummy $ac_dir: $ac_dir/Makefile libs/port dummy
@cd $ac_dir && \$(MAKE)" @cd $ac_dir && \$(MAKE)"
case $ac_dir in
tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;;
esac
fi fi
} }