From 65c6ca594757dedbd15fa78649d5b6e05780c689 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 25 Feb 2009 16:05:55 +0100
Subject: [PATCH] programs: Get rid of the remaining binary wrappers, they
 break out-of-tree builds.

---
 .gitignore           | 11 -----------
 configure            | 12 ------------
 configure.ac         | 10 ----------
 programs/Makefile.in |  9 +--------
 tools/make_makefiles |  4 ----
 5 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf63122a49..f853aba7a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -226,10 +226,6 @@ loader/wine.de.man
 loader/wine.fr.man
 loader/wine.man
 programs/Makeprog.rules
-programs/msiexec/msiexec
-programs/notepad/notepad
-programs/regedit/regedit
-programs/regsvr32/regsvr32
 programs/rpcss/epm.h
 programs/rpcss/epm_s.c
 programs/rpcss/irot.h
@@ -237,17 +233,10 @@ programs/rpcss/irot_s.c
 programs/services/svcctl.h
 programs/services/svcctl_s.c
 programs/wineapploader
-programs/wineboot/wineboot
-programs/winecfg/winecfg
-programs/wineconsole/wineconsole
 programs/winedbg/dbg.tab.c
 programs/winedbg/dbg.tab.h
 programs/winedbg/debug.yy.c
-programs/winedbg/winedbg
 programs/winedbg/winedbg.man
-programs/winefile/winefile
-programs/winemine/winemine
-programs/winepath/winepath
 programs/winetest/*_test.exe
 programs/winetest/tests.rc
 programs/winhlp32/macro.lex.yy.c
diff --git a/configure b/configure
index 2b9b4e49dd..e5a4fcc392 100755
--- a/configure
+++ b/configure
@@ -639,7 +639,6 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-ALL_PROGRAM_BIN_WRAPPERS
 ALL_WINETEST_DEPENDS
 ALL_PROGRAM_BIN_INSTALL_DIRS
 ALL_PROGRAM_INSTALL_DIRS
@@ -28000,17 +27999,6 @@ done
 
 test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
 
-ALL_PROGRAM_BIN_WRAPPERS=""
-
-for dir in $ALL_PROGRAM_BIN_INSTALL_DIRS
-do
-    if test "$dir" != "\\"
-    then
-        ALL_PROGRAM_BIN_WRAPPERS="$ALL_PROGRAM_BIN_WRAPPERS \\
-	$dir/$dir"
-    fi
-done
-
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/configure.ac b/configure.ac
index 8db0c51688..67241f2585 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2336,16 +2336,6 @@ done
 dnl Don't install in bin dir for Windows build
 test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
 
-AC_SUBST(ALL_PROGRAM_BIN_WRAPPERS,"")
-for dir in $ALL_PROGRAM_BIN_INSTALL_DIRS
-do
-    if test "$dir" != "\\"
-    then
-        ALL_PROGRAM_BIN_WRAPPERS="$ALL_PROGRAM_BIN_WRAPPERS \\
-	$dir/$dir"
-    fi
-done
-
 AC_OUTPUT
 
 if test "$no_create" = "yes"
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 3bc7abdb01..7bd60b27da 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 SUBDIRS        = @ALL_PROGRAM_DIRS@
 INSTALLSUBDIRS = @ALL_PROGRAM_INSTALL_DIRS@
 INSTALLPROGS   = @ALL_PROGRAM_BIN_INSTALL_DIRS@
-BIN_WRAPPERS   = @ALL_PROGRAM_BIN_WRAPPERS@
 
 INSTALLDIRS = $(DESTDIR)$(bindir)
 
@@ -14,14 +13,11 @@ PROGRAMS = wineapploader
 
 @MAKE_RULES@
 
-all: $(PROGRAMS) $(SUBDIRS) $(BIN_WRAPPERS)
+all: $(PROGRAMS) $(SUBDIRS)
 
 wineapploader: wineapploader.in
 	sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
 
-$(BIN_WRAPPERS): $(WINEWRAPPER)
-	$(RM) $@ && $(LN) $(WINEWRAPPER) $@
-
 # Rules for installation
 
 .PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
@@ -43,9 +39,6 @@ uninstall::
 	-cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS)
 	-rmdir $(DESTDIR)$(dlldir)
 
-clean::
-	$(RM) $(BIN_WRAPPERS)
-
 # Rules for testing
 
 check test:: $(SUBDIRS:%=%/__test__)
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 7f04e22a7f..ff6e85a5ad 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -541,10 +541,6 @@ sub update_gitignore(@)
         {
             push @ignores, map { s/\$\(EXEEXT\)//; $dir . $_; } @{$makefile{"PROGRAMS"}};
         }
-        if ($dir =~ /^programs\/(.*)\/$/)
-        {
-            push @ignores, "$dir$1" if $bin_install{$1};
-        }
     }
 
     # prepend a slash to paths that don't have one
-- 
2.32.0.93.g670b81a890