Module: wine Branch: master Commit: d9e9599310fcab7f6009c9790361a04ee8c82133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e9599310fcab7f6009c97903...
Author: Alexandre Julliard julliard@winehq.org Date: Sun Nov 8 14:07:39 2015 +0900
makefiles: Only set the manpage flag for programs.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 18 +++++++++--------- configure.ac | 18 +++++++++--------- tools/make_makefiles | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/configure b/configure index 6da7b76..08f1ec1 100755 --- a/configure +++ b/configure @@ -18147,7 +18147,7 @@ wine_fn_config_makefile include enable_include clean,install-dev wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine clean,config,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp -wine_fn_config_makefile loader enable_loader clean,config,install-lib,manpage +wine_fn_config_makefile loader enable_loader clean,config,install-lib wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install,po @@ -18239,16 +18239,16 @@ wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test -wine_fn_config_makefile server enable_server clean,install-lib,manpage +wine_fn_config_makefile server enable_server clean,install-lib wine_fn_config_tool tools clean wine_fn_config_tool tools/sfnt2fon clean -wine_fn_config_tool tools/widl clean,install-dev,manpage -wine_fn_config_tool tools/winebuild clean,install-dev,manpage -wine_fn_config_tool tools/winedump clean,install-dev,manpage -wine_fn_config_tool tools/winegcc clean,install-dev,manpage -wine_fn_config_tool tools/winemaker install-dev,manpage -wine_fn_config_tool tools/wmc clean,install-dev,manpage -wine_fn_config_tool tools/wrc clean,install-dev,manpage +wine_fn_config_tool tools/widl clean,install-dev +wine_fn_config_tool tools/winebuild clean,install-dev +wine_fn_config_tool tools/winedump clean,install-dev +wine_fn_config_tool tools/winegcc clean,install-dev +wine_fn_config_tool tools/winemaker clean,install-dev +wine_fn_config_tool tools/wmc clean,install-dev +wine_fn_config_tool tools/wrc clean,install-dev
LINGUAS="\ ar \ diff --git a/configure.ac b/configure.ac index 68fd411..c514192 100644 --- a/configure.ac +++ b/configure.ac @@ -3501,7 +3501,7 @@ WINE_CONFIG_MAKEFILE([include],,[clean,install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,config,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib,manpage]) +WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install,po]) @@ -3593,16 +3593,16 @@ WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) -WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) +WINE_CONFIG_MAKEFILE([server],,[clean,install-lib]) WINE_CONFIG_TOOL(tools,[clean]) WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) -WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winemaker,[install-dev,manpage]) -WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev,manpage]) +WINE_CONFIG_TOOL(tools/widl,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winemaker,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev])
AC_SUBST([LINGUAS],["\ ar \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 28e448a..3c14751 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -373,7 +373,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /.man.in$/) { push @{${$make}{"=MANPAGES"}}, $name; - ${${$make}{"=flags"}}{"manpage"} = 1; + ${${$make}{"=flags"}}{($file =~ /^programs//) ? "manpage" : "clean"} = 1; } elsif ($name =~ /.in$/) {