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

makefiles: Output all the dll install rules explicitly for each module.

This commit is contained in:
Alexandre Julliard 2010-03-25 11:15:32 +01:00
parent c2c3c21078
commit 82b743ffad
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -36,15 +36,13 @@ ALL_TOP_DIRS = @ALL_TOP_DIRS@
BUILDSUBDIRS = \
libs/wine \
$(ALL_TOOL_DIRS) \
$(ALL_TOP_DIRS) \
$(ALL_DLL_DIRS)
$(ALL_TOP_DIRS)
# Sub-directories to run make install/uninstall into
INSTALLSUBDIRS = \
libs/wine \
$(ALL_TOOL_DIRS) \
$(ALL_TOP_DIRS) \
$(ALL_DLL_DIRS)
$(ALL_TOP_DIRS)
# Sub-directories that don't have a makefile
EXTRASUBDIRS = dlls libs

23
aclocal.m4 vendored
View File

@ -209,14 +209,23 @@ wine_fn_config_dll ()
wine_fn_append_file ALL_DIRS dlls/$ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"dlls/$ac_dir dlls/$ac_dir/__install__ dlls/$ac_dir/__install-lib__ dlls/$ac_dir/__install-dev__: __builddeps__ dlls/$ac_dir/Makefile
dlls/$ac_dir/__clean__ dlls/$ac_dir/__uninstall__ dlls/$ac_dir: dlls/$ac_dir/Makefile
"dlls/$ac_dir/__clean__: dlls/$ac_dir/Makefile
dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.status dlls/Makedll.rules \$(MAKEDEP)
@./config.status --file dlls/$ac_dir/Makefile && cd dlls/$ac_dir && \$(MAKE) depend"
AS_VAR_IF([$ac_enable],[no],
dnl enable_win16 is special in that it disables import libs too
[test "$ac_enable" != enable_win16 || return 0],
[wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir])
[wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: dlls/$ac_dir
dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__
install:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install
install-lib:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-lib
uninstall:: dlls/$ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) uninstall"])
if test -n "$ac_implibsrc"
then
@ -227,14 +236,18 @@ $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`
$ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`"
@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`
install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev"
elif test -n "$ac_implib"
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT
__buildcrossdeps__: $ac_file.cross.a
$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`"
@cd dlls/$ac_dir && \$(MAKE) \`basename \$[@]\`
install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev"
if test "$ac_dir" != "$ac_implib"
then

21
configure vendored
View File

@ -13932,15 +13932,24 @@ wine_fn_config_dll ()
wine_fn_append_file ALL_DIRS dlls/$ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"dlls/$ac_dir dlls/$ac_dir/__install__ dlls/$ac_dir/__install-lib__ dlls/$ac_dir/__install-dev__: __builddeps__ dlls/$ac_dir/Makefile
dlls/$ac_dir/__clean__ dlls/$ac_dir/__uninstall__ dlls/$ac_dir: dlls/$ac_dir/Makefile
"dlls/$ac_dir/__clean__: dlls/$ac_dir/Makefile
dlls/$ac_dir/Makefile dlls/$ac_dir/__depend__: dlls/$ac_dir/Makefile.in config.status dlls/Makedll.rules \$(MAKEDEP)
@./config.status --file dlls/$ac_dir/Makefile && cd dlls/$ac_dir && \$(MAKE) depend"
eval as_val=\$$ac_enable
if test "x$as_val" = x""no; then :
test "$ac_enable" != enable_win16 || return 0
else
wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: dlls/$ac_dir
dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__
install:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install
install-lib:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-lib
uninstall:: dlls/$ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) uninstall"
fi
if test -n "$ac_implibsrc"
@ -13952,14 +13961,18 @@ $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps
$ac_file.def: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile
@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`
$ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/Makefile dummy
@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`"
@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`
install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev"
elif test -n "$ac_implib"
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"__builddeps__: $ac_file.$IMPLIBEXT
__buildcrossdeps__: $ac_file.cross.a
$ac_file.$IMPLIBEXT $ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps
@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`"
@cd dlls/$ac_dir && \$(MAKE) \`basename \$@\`
install-dev:: dlls/$ac_dir/Makefile __builddeps__
@cd dlls/$ac_dir && \$(MAKE) install-dev"
if test "$ac_dir" != "$ac_implib"
then