makefiles: Generate all the program rules inside the corresponding shell function.

aclocal.m4

@@ -233,8 +233,20 @@ clean::
 wine_fn_config_program ()
 {
     ac_dir=$[1]
+    ac_enable=$[2]
+    ac_install=$[3]
+    wine_fn_append_file ALL_DIRS programs/$ac_dir
     wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
-"programs/$ac_dir programs/$ac_dir/__install__ programs/$ac_dir/__install-lib__: __builddeps__"
+"programs/$ac_dir programs/$ac_dir/__install__ programs/$ac_dir/__install-lib__: __builddeps__ programs/$ac_dir/Makefile
+programs/$ac_dir/__clean__ programs/$ac_dir/__install-dev__ programs/$ac_dir/__uninstall__ programs/$ac_dir: programs/$ac_dir/Makefile
+programs/$ac_dir/Makefile programs/$ac_dir/__depend__: programs/$ac_dir/Makefile.in config.status programs/Makeprog.rules \$(MAKEDEP)
+	@./config.status --file programs/$ac_dir/Makefile && cd programs/$ac_dir && \$(MAKE) depend"
+    AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_file ALL_PROGRAM_DIRS programs/$ac_dir
+              case $ac_install in
+               installbin) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir
+                           wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir ;;
+               install) wine_fn_append_file ALL_INSTALL_DIRS programs/$ac_dir ;;
+              esac])
 }
 
 wine_fn_config_test ()
@@ -323,11 +335,12 @@ AS_VAR_POPDEF([ac_enable])])
 
 dnl **** Create a program makefile from config.status ****
 dnl
-dnl Usage: WINE_CONFIG_PROGRAM(name,var,enable)
+dnl Usage: WINE_CONFIG_PROGRAM(name,install,enable)
 dnl
 AC_DEFUN([WINE_CONFIG_PROGRAM],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
-wine_fn_config_program [$1]
-WINE_CONFIG_MAKEFILE([programs/$1/Makefile],[programs/Makeprog.rules],[$2],[$3])])
+AS_VAR_PUSHDEF([ac_enable],m4_default([$3],[enable_]$1))dnl
+wine_fn_config_program [$1] ac_enable [$2]dnl
+AS_VAR_POPDEF([ac_enable])])
 
 dnl **** Create a test makefile from config.status ****
 dnl

configure.ac

@@ -2642,63 +2642,63 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules])
 WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules])
 WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[ALL_TOP_DIRS])
 WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[ALL_TOP_DIRS])
-WINE_CONFIG_PROGRAM(attrib,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(cacls,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(clock,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(cmd,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
+WINE_CONFIG_PROGRAM(attrib,install)
+WINE_CONFIG_PROGRAM(cacls,install)
+WINE_CONFIG_PROGRAM(clock,install)
+WINE_CONFIG_PROGRAM(cmd,install)
 WINE_CONFIG_TEST(programs/cmd/tests)
-WINE_CONFIG_PROGRAM(cmdlgtst,[ALL_PROGRAM_DIRS])
-WINE_CONFIG_PROGRAM(control,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(dxdiag,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(eject,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(expand,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(explorer,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(extrac32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(hh,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(icinfo,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(iexplore,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(lodctr,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(mshta,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(msiexec,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(net,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(notepad,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(oleview,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(ping,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(progman,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(reg,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(regedit,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(regsvr32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(rpcss,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(rundll32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(secedit,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(services,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(spoolsv,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(start,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(svchost,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(taskmgr,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(termsv,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(uninstaller,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(unlodctr,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(view,[ALL_PROGRAM_DIRS])
-WINE_CONFIG_PROGRAM(wineboot,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winebrowser,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winecfg,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(wineconsole,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winedbg,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winedevice,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winefile,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winemenubuilder,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winemine,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winepath,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winetest,[ALL_PROGRAM_DIRS])
-WINE_CONFIG_PROGRAM(winevdm,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS],enable_win16)
-WINE_CONFIG_PROGRAM(winhelp.exe16,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS],enable_win16)
-WINE_CONFIG_PROGRAM(winhlp32,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(winoldap.mod16,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS],enable_win16)
-WINE_CONFIG_PROGRAM(winver,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(wordpad,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
-WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS])
+WINE_CONFIG_PROGRAM(cmdlgtst)
+WINE_CONFIG_PROGRAM(control,install)
+WINE_CONFIG_PROGRAM(dxdiag,install)
+WINE_CONFIG_PROGRAM(eject,install)
+WINE_CONFIG_PROGRAM(expand,install)
+WINE_CONFIG_PROGRAM(explorer,install)
+WINE_CONFIG_PROGRAM(extrac32,install)
+WINE_CONFIG_PROGRAM(hh,install)
+WINE_CONFIG_PROGRAM(icinfo,install)
+WINE_CONFIG_PROGRAM(iexplore,install)
+WINE_CONFIG_PROGRAM(lodctr,install)
+WINE_CONFIG_PROGRAM(mshta,install)
+WINE_CONFIG_PROGRAM(msiexec,installbin)
+WINE_CONFIG_PROGRAM(net,install)
+WINE_CONFIG_PROGRAM(notepad,installbin)
+WINE_CONFIG_PROGRAM(oleview,install)
+WINE_CONFIG_PROGRAM(ping,install)
+WINE_CONFIG_PROGRAM(progman,install)
+WINE_CONFIG_PROGRAM(reg,install)
+WINE_CONFIG_PROGRAM(regedit,installbin)
+WINE_CONFIG_PROGRAM(regsvr32,installbin)
+WINE_CONFIG_PROGRAM(rpcss,install)
+WINE_CONFIG_PROGRAM(rundll32,install)
+WINE_CONFIG_PROGRAM(secedit,install)
+WINE_CONFIG_PROGRAM(services,install)
+WINE_CONFIG_PROGRAM(spoolsv,install)
+WINE_CONFIG_PROGRAM(start,install)
+WINE_CONFIG_PROGRAM(svchost,install)
+WINE_CONFIG_PROGRAM(taskmgr,install)
+WINE_CONFIG_PROGRAM(termsv,install)
+WINE_CONFIG_PROGRAM(uninstaller,install)
+WINE_CONFIG_PROGRAM(unlodctr,install)
+WINE_CONFIG_PROGRAM(view)
+WINE_CONFIG_PROGRAM(wineboot,installbin)
+WINE_CONFIG_PROGRAM(winebrowser,install)
+WINE_CONFIG_PROGRAM(winecfg,installbin)
+WINE_CONFIG_PROGRAM(wineconsole,installbin)
+WINE_CONFIG_PROGRAM(winedbg,installbin)
+WINE_CONFIG_PROGRAM(winedevice,install)
+WINE_CONFIG_PROGRAM(winefile,installbin)
+WINE_CONFIG_PROGRAM(winemenubuilder,install)
+WINE_CONFIG_PROGRAM(winemine,installbin)
+WINE_CONFIG_PROGRAM(winepath,installbin)
+WINE_CONFIG_PROGRAM(winetest)
+WINE_CONFIG_PROGRAM(winevdm,install,enable_win16)
+WINE_CONFIG_PROGRAM(winhelp.exe16,install,enable_win16)
+WINE_CONFIG_PROGRAM(winhlp32,install)
+WINE_CONFIG_PROGRAM(winoldap.mod16,install,enable_win16)
+WINE_CONFIG_PROGRAM(winver,install)
+WINE_CONFIG_PROGRAM(wordpad,install)
+WINE_CONFIG_PROGRAM(write,install)
+WINE_CONFIG_PROGRAM(xcopy,install)
 WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[ALL_TOP_DIRS])
 WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools)
 WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools)

tools/make_makefiles

@@ -373,10 +373,10 @@ sub update_makefiles(@)
         elsif ($rules eq $makerules{"MAKE_PROG_RULES"})
         {
             (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/;
-            $args = ",[ALL_PROGRAM_DIRS";
-            $args .= ",ALL_INSTALL_DIRS" unless $dont_install{$name};
-            $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name};
-            $args .= "]";
+            my $install = $dont_install{$name} ? "" : "install";
+            $install .= "bin" if $bin_install{$name};
+            $args .= "," if $is_win16 || $install;
+            $args .= "$install" if $install;
             $args .= ",enable_win16" if $is_win16;
             push @lines, "WINE_CONFIG_PROGRAM($name$args)\n";
         }