marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

oldstable
Alexandre Julliard 2010-03-25 11:51:24 +01:00
parent 82b743ffad
commit 6dbe7a0388
3 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

@ -29,19 +29,16 @@ MODULE = none
ALL_DIRS = @ALL_DIRS@
ALL_DLL_DIRS = @ALL_DLL_DIRS@
ALL_TOOL_DIRS = @ALL_TOOL_DIRS@
ALL_TOP_DIRS = @ALL_TOP_DIRS@
# Sub-directories to run make all into
BUILDSUBDIRS = \
libs/wine \
$(ALL_TOOL_DIRS) \
$(ALL_TOP_DIRS)
# Sub-directories to run make install/uninstall into
INSTALLSUBDIRS = \
libs/wine \
$(ALL_TOOL_DIRS) \
$(ALL_TOP_DIRS)
# Sub-directories that don't have a makefile
@ -156,14 +153,14 @@ manpages htmlpages sgmlpages xmlpages: dummy
# Dependencies between directories
# dependencies needed to build any dll or program
__tooldeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS)
__tooldeps__: libs/port libs/wine libs/wpp
__builddeps__ __buildcrossdeps__: __tooldeps__ include
.PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__
loader server: libs/port libs/wine tools
fonts: tools
include: tools/widl
libs/wine $(ALL_TOOL_DIRS): libs/port
libs/wine: libs/port
tools/wmc tools/wrc: tools
tools tools/wmc tools/wrc: libs/wine
tools/widl tools/wmc tools/wrc: libs/wpp
@ -173,13 +170,6 @@ include/__install__ include/__install-dev__: include
libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__: libs/wine
loader/__install__ loader/__install-lib__: libs/port libs/wine tools
server/__install__ server/__install-lib__: libs/port libs/wine tools
tools/__install__ tools/__install-lib__ tools/__install-dev__: tools
tools/widl/__install__ tools/widl/__install-dev__: tools/widl
tools/winebuild/__install__ tools/winebuild/__install-dev__: tools/winebuild
tools/winedump/__install__ tools/winedump/__install-dev__: tools/winedump
tools/winegcc/__install__ tools/winegcc/__install-dev__: tools/winegcc
tools/wmc/__install__ tools/wmc/__install-dev__: tools/wmc
tools/wrc/__install__ tools/wrc/__install-dev__: tools/wrc
tools/__depend__: $(MAKEDEP)
$(MAKEDEP): include/config.h tools/Makefile

23
aclocal.m4 vendored
View File

@ -149,7 +149,6 @@ AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_DIRS,"")
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_DLL_DIRS,"")
AC_SUBST(ALL_TOOL_DIRS,"")
AC_SUBST(ALL_TEST_BINARIES,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
@ -328,10 +327,28 @@ wine_fn_config_tool ()
fi
wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile
"$ac_dir/__clean__: $ac_dir/Makefile
$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps
@./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend"
AS_VAR_IF([enable_tools],[no],,[wine_fn_append_file ALL_TOOL_DIRS $ac_dir])
AS_VAR_IF([enable_tools],[no],,[case $ac_dir in
dnl tools directory has both install-lib and install-dev
tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install:: $ac_dir
@cd $ac_dir && \$(MAKE) install
install-lib:: $ac_dir
@cd $ac_dir && \$(MAKE) install-lib
install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install-dev" ;;
*) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install" ;;
esac
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall
all __tooldeps__: $ac_dir
$ac_dir: $ac_dir/Makefile libs/port"])
}])
dnl **** Define helper function to append a file to a makefile file list ****

24
configure vendored
View File

@ -598,7 +598,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
ALL_PROGRAM_BIN_INSTALL_DIRS
ALL_TEST_BINARIES
ALL_TOOL_DIRS
ALL_DLL_DIRS
ALL_TOP_DIRS
ALL_DIRS
@ -13864,8 +13863,6 @@ ALL_TOP_DIRS=""
ALL_DLL_DIRS=""
ALL_TOOL_DIRS=""
ALL_TEST_BINARIES=""
ALL_PROGRAM_BIN_INSTALL_DIRS=""
@ -14061,13 +14058,30 @@ wine_fn_config_tool ()
fi
wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_dir/__clean__ $ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir: $ac_dir/Makefile
"$ac_dir/__clean__: $ac_dir/Makefile
$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status $ac_deps
@./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend"
if test "x$enable_tools" = x""no; then :
else
wine_fn_append_file ALL_TOOL_DIRS $ac_dir
case $ac_dir in
tools) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install:: $ac_dir
@cd $ac_dir && \$(MAKE) install
install-lib:: $ac_dir
@cd $ac_dir && \$(MAKE) install-lib
install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install-dev" ;;
*) wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install" ;;
esac
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall
all __tooldeps__: $ac_dir
$ac_dir: $ac_dir/Makefile libs/port"
fi
}
ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"