Commit 65c6ca59 authored by Alexandre Julliard's avatar Alexandre Julliard

programs: Get rid of the remaining binary wrappers, they break out-of-tree builds.

parent 0e4b0b9f
...@@ -226,10 +226,6 @@ loader/wine.de.man ...@@ -226,10 +226,6 @@ loader/wine.de.man
loader/wine.fr.man loader/wine.fr.man
loader/wine.man loader/wine.man
programs/Makeprog.rules programs/Makeprog.rules
programs/msiexec/msiexec
programs/notepad/notepad
programs/regedit/regedit
programs/regsvr32/regsvr32
programs/rpcss/epm.h programs/rpcss/epm.h
programs/rpcss/epm_s.c programs/rpcss/epm_s.c
programs/rpcss/irot.h programs/rpcss/irot.h
...@@ -237,17 +233,10 @@ programs/rpcss/irot_s.c ...@@ -237,17 +233,10 @@ programs/rpcss/irot_s.c
programs/services/svcctl.h programs/services/svcctl.h
programs/services/svcctl_s.c programs/services/svcctl_s.c
programs/wineapploader programs/wineapploader
programs/wineboot/wineboot
programs/winecfg/winecfg
programs/wineconsole/wineconsole
programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.c
programs/winedbg/dbg.tab.h programs/winedbg/dbg.tab.h
programs/winedbg/debug.yy.c programs/winedbg/debug.yy.c
programs/winedbg/winedbg
programs/winedbg/winedbg.man programs/winedbg/winedbg.man
programs/winefile/winefile
programs/winemine/winemine
programs/winepath/winepath
programs/winetest/*_test.exe programs/winetest/*_test.exe
programs/winetest/tests.rc programs/winetest/tests.rc
programs/winhlp32/macro.lex.yy.c programs/winhlp32/macro.lex.yy.c
......
...@@ -639,7 +639,6 @@ ac_includes_default="\ ...@@ -639,7 +639,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
LIBOBJS LIBOBJS
ALL_PROGRAM_BIN_WRAPPERS
ALL_WINETEST_DEPENDS ALL_WINETEST_DEPENDS
ALL_PROGRAM_BIN_INSTALL_DIRS ALL_PROGRAM_BIN_INSTALL_DIRS
ALL_PROGRAM_INSTALL_DIRS ALL_PROGRAM_INSTALL_DIRS
...@@ -28000,17 +27999,6 @@ done ...@@ -28000,17 +27999,6 @@ done
test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" 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 cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure # tests run on this system so they can be shared between configure
......
...@@ -2336,16 +2336,6 @@ done ...@@ -2336,16 +2336,6 @@ done
dnl Don't install in bin dir for Windows build dnl Don't install in bin dir for Windows build
test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" 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 AC_OUTPUT
if test "$no_create" = "yes" if test "$no_create" = "yes"
......
...@@ -6,7 +6,6 @@ VPATH = @srcdir@ ...@@ -6,7 +6,6 @@ VPATH = @srcdir@
SUBDIRS = @ALL_PROGRAM_DIRS@ SUBDIRS = @ALL_PROGRAM_DIRS@
INSTALLSUBDIRS = @ALL_PROGRAM_INSTALL_DIRS@ INSTALLSUBDIRS = @ALL_PROGRAM_INSTALL_DIRS@
INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@
BIN_WRAPPERS = @ALL_PROGRAM_BIN_WRAPPERS@
INSTALLDIRS = $(DESTDIR)$(bindir) INSTALLDIRS = $(DESTDIR)$(bindir)
...@@ -14,14 +13,11 @@ PROGRAMS = wineapploader ...@@ -14,14 +13,11 @@ PROGRAMS = wineapploader
@MAKE_RULES@ @MAKE_RULES@
all: $(PROGRAMS) $(SUBDIRS) $(BIN_WRAPPERS) all: $(PROGRAMS) $(SUBDIRS)
wineapploader: wineapploader.in wineapploader: wineapploader.in
sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false)
$(BIN_WRAPPERS): $(WINEWRAPPER)
$(RM) $@ && $(LN) $(WINEWRAPPER) $@
# Rules for installation # Rules for installation
.PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) .PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
...@@ -43,9 +39,6 @@ uninstall:: ...@@ -43,9 +39,6 @@ uninstall::
-cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS)
-rmdir $(DESTDIR)$(dlldir) -rmdir $(DESTDIR)$(dlldir)
clean::
$(RM) $(BIN_WRAPPERS)
# Rules for testing # Rules for testing
check test:: $(SUBDIRS:%=%/__test__) check test:: $(SUBDIRS:%=%/__test__)
...@@ -541,10 +541,6 @@ sub update_gitignore(@) ...@@ -541,10 +541,6 @@ sub update_gitignore(@)
{ {
push @ignores, map { s/\$\(EXEEXT\)//; $dir . $_; } @{$makefile{"PROGRAMS"}}; 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 # prepend a slash to paths that don't have one
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment