Alexandre Julliard : programs: Get rid of application symlinks, they are no longer needed.
Module: wine Branch: refs/heads/master Commit: 02ff174bf145be734f66a53d2e646a46487b8f34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02ff174bf145be734f66a53d... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 20 20:47:58 2006 +0100 programs: Get rid of application symlinks, they are no longer needed. --- programs/Makefile.in | 190 +------------------------------------------------- programs/make_progs | 34 +-------- 2 files changed, 6 insertions(+), 218 deletions(-) diff --git a/programs/Makefile.in b/programs/Makefile.in index 87053c4..0c0426a 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -94,48 +94,9 @@ INSTALLPROGS = \ winepath \ winhelp -# Symlinks to apps that we want to run from inside the source tree -SYMLINKS = \ - aviinfo.exe$(DLLEXT) \ - aviplay.exe$(DLLEXT) \ - clock.exe$(DLLEXT) \ - cmdlgtst.exe$(DLLEXT) \ - control.exe$(DLLEXT) \ - eject.exe$(DLLEXT) \ - expand.exe$(DLLEXT) \ - explorer.exe$(DLLEXT) \ - hh.exe$(DLLEXT) \ - icinfo.exe$(DLLEXT) \ - msiexec.exe$(DLLEXT) \ - notepad.exe$(DLLEXT) \ - progman.exe$(DLLEXT) \ - regedit.exe$(DLLEXT) \ - regsvr32.exe$(DLLEXT) \ - rpcss.exe$(DLLEXT) \ - rundll32.exe$(DLLEXT) \ - start.exe$(DLLEXT) \ - taskmgr.exe$(DLLEXT) \ - uninstaller.exe$(DLLEXT) \ - view.exe$(DLLEXT) \ - wcmd.exe$(DLLEXT) \ - wineboot.exe$(DLLEXT) \ - winebrowser.exe$(DLLEXT) \ - winecfg.exe$(DLLEXT) \ - wineconsole.exe$(DLLEXT) \ - winedbg.exe$(DLLEXT) \ - winefile.exe$(DLLEXT) \ - winemenubuilder.exe$(DLLEXT) \ - winemine.exe$(DLLEXT) \ - winepath.exe$(DLLEXT) \ - winetest.exe$(DLLEXT) \ - winevdm.exe$(DLLEXT) \ - winhelp.exe$(DLLEXT) \ - winver.exe$(DLLEXT) \ - wordpad.exe$(DLLEXT) - @MAKE_RULES@ -all: wineapploader winelauncher $(SUBDIRS) $(SYMLINKS) +all: wineapploader winelauncher $(SUBDIRS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) @@ -168,157 +129,10 @@ uninstall:: -rmdir $(DESTDIR)$(dlldir) clean:: - $(RM) wineapploader winelauncher $(SYMLINKS) + $(RM) wineapploader winelauncher # Rules for testing check test:: $(SUBDIRS:%=%/__test__) -# Rules for symlinks - -aviinfo.exe$(DLLEXT): avitools/aviinfo.exe$(DLLEXT) - $(RM) $@ && $(LN_S) avitools/aviinfo.exe$(DLLEXT) $@ - -aviplay.exe$(DLLEXT): avitools/aviplay.exe$(DLLEXT) - $(RM) $@ && $(LN_S) avitools/aviplay.exe$(DLLEXT) $@ - -clock.exe$(DLLEXT): clock/clock.exe$(DLLEXT) - $(RM) $@ && $(LN_S) clock/clock.exe$(DLLEXT) $@ - -cmdlgtst.exe$(DLLEXT): cmdlgtst/cmdlgtst.exe$(DLLEXT) - $(RM) $@ && $(LN_S) cmdlgtst/cmdlgtst.exe$(DLLEXT) $@ - -control.exe$(DLLEXT): control/control.exe$(DLLEXT) - $(RM) $@ && $(LN_S) control/control.exe$(DLLEXT) $@ - -eject.exe$(DLLEXT): eject/eject.exe$(DLLEXT) - $(RM) $@ && $(LN_S) eject/eject.exe$(DLLEXT) $@ - -expand.exe$(DLLEXT): expand/expand.exe$(DLLEXT) - $(RM) $@ && $(LN_S) expand/expand.exe$(DLLEXT) $@ - -explorer.exe$(DLLEXT): explorer/explorer.exe$(DLLEXT) - $(RM) $@ && $(LN_S) explorer/explorer.exe$(DLLEXT) $@ - -hh.exe$(DLLEXT): hh/hh.exe$(DLLEXT) - $(RM) $@ && $(LN_S) hh/hh.exe$(DLLEXT) $@ - -icinfo.exe$(DLLEXT): avitools/icinfo.exe$(DLLEXT) - $(RM) $@ && $(LN_S) avitools/icinfo.exe$(DLLEXT) $@ - -msiexec.exe$(DLLEXT): msiexec/msiexec.exe$(DLLEXT) - $(RM) $@ && $(LN_S) msiexec/msiexec.exe$(DLLEXT) $@ - -notepad.exe$(DLLEXT): notepad/notepad.exe$(DLLEXT) - $(RM) $@ && $(LN_S) notepad/notepad.exe$(DLLEXT) $@ - -progman.exe$(DLLEXT): progman/progman.exe$(DLLEXT) - $(RM) $@ && $(LN_S) progman/progman.exe$(DLLEXT) $@ - -regedit.exe$(DLLEXT): regedit/regedit.exe$(DLLEXT) - $(RM) $@ && $(LN_S) regedit/regedit.exe$(DLLEXT) $@ - -regsvr32.exe$(DLLEXT): regsvr32/regsvr32.exe$(DLLEXT) - $(RM) $@ && $(LN_S) regsvr32/regsvr32.exe$(DLLEXT) $@ - -rpcss.exe$(DLLEXT): rpcss/rpcss.exe$(DLLEXT) - $(RM) $@ && $(LN_S) rpcss/rpcss.exe$(DLLEXT) $@ - -rundll32.exe$(DLLEXT): rundll32/rundll32.exe$(DLLEXT) - $(RM) $@ && $(LN_S) rundll32/rundll32.exe$(DLLEXT) $@ - -start.exe$(DLLEXT): start/start.exe$(DLLEXT) - $(RM) $@ && $(LN_S) start/start.exe$(DLLEXT) $@ - -taskmgr.exe$(DLLEXT): taskmgr/taskmgr.exe$(DLLEXT) - $(RM) $@ && $(LN_S) taskmgr/taskmgr.exe$(DLLEXT) $@ - -uninstaller.exe$(DLLEXT): uninstaller/uninstaller.exe$(DLLEXT) - $(RM) $@ && $(LN_S) uninstaller/uninstaller.exe$(DLLEXT) $@ - -view.exe$(DLLEXT): view/view.exe$(DLLEXT) - $(RM) $@ && $(LN_S) view/view.exe$(DLLEXT) $@ - -wcmd.exe$(DLLEXT): wcmd/wcmd.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wcmd/wcmd.exe$(DLLEXT) $@ - -wineboot.exe$(DLLEXT): wineboot/wineboot.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wineboot/wineboot.exe$(DLLEXT) $@ - -winebrowser.exe$(DLLEXT): winebrowser/winebrowser.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winebrowser/winebrowser.exe$(DLLEXT) $@ - -winecfg.exe$(DLLEXT): winecfg/winecfg.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winecfg/winecfg.exe$(DLLEXT) $@ - -wineconsole.exe$(DLLEXT): wineconsole/wineconsole.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wineconsole/wineconsole.exe$(DLLEXT) $@ - -winedbg.exe$(DLLEXT): winedbg/winedbg.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winedbg/winedbg.exe$(DLLEXT) $@ - -winefile.exe$(DLLEXT): winefile/winefile.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winefile/winefile.exe$(DLLEXT) $@ - -winemenubuilder.exe$(DLLEXT): winemenubuilder/winemenubuilder.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winemenubuilder/winemenubuilder.exe$(DLLEXT) $@ - -winemine.exe$(DLLEXT): winemine/winemine.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winemine/winemine.exe$(DLLEXT) $@ - -winepath.exe$(DLLEXT): winepath/winepath.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winepath/winepath.exe$(DLLEXT) $@ - -winetest.exe$(DLLEXT): winetest/winetest.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winetest/winetest.exe$(DLLEXT) $@ - -winevdm.exe$(DLLEXT): winevdm/winevdm.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winevdm/winevdm.exe$(DLLEXT) $@ - -winhelp.exe$(DLLEXT): winhelp/winhelp.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winhelp/winhelp.exe$(DLLEXT) $@ - -winver.exe$(DLLEXT): winver/winver.exe$(DLLEXT) - $(RM) $@ && $(LN_S) winver/winver.exe$(DLLEXT) $@ - -wordpad.exe$(DLLEXT): wordpad/wordpad.exe$(DLLEXT) - $(RM) $@ && $(LN_S) wordpad/wordpad.exe$(DLLEXT) $@ - -avitools/aviinfo.exe$(DLLEXT): avitools -avitools/aviplay.exe$(DLLEXT): avitools -clock/clock.exe$(DLLEXT): clock -cmdlgtst/cmdlgtst.exe$(DLLEXT): cmdlgtst -control/control.exe$(DLLEXT): control -eject/eject.exe$(DLLEXT): eject -expand/expand.exe$(DLLEXT): expand -explorer/explorer.exe$(DLLEXT): explorer -hh/hh.exe$(DLLEXT): hh -avitools/icinfo.exe$(DLLEXT): avitools -msiexec/msiexec.exe$(DLLEXT): msiexec -notepad/notepad.exe$(DLLEXT): notepad -progman/progman.exe$(DLLEXT): progman -regedit/regedit.exe$(DLLEXT): regedit -regsvr32/regsvr32.exe$(DLLEXT): regsvr32 -rpcss/rpcss.exe$(DLLEXT): rpcss -rundll32/rundll32.exe$(DLLEXT): rundll32 -start/start.exe$(DLLEXT): start -taskmgr/taskmgr.exe$(DLLEXT): taskmgr -uninstaller/uninstaller.exe$(DLLEXT): uninstaller -view/view.exe$(DLLEXT): view -wcmd/wcmd.exe$(DLLEXT): wcmd -wineboot/wineboot.exe$(DLLEXT): wineboot -winebrowser/winebrowser.exe$(DLLEXT): winebrowser -winecfg/winecfg.exe$(DLLEXT): winecfg -wineconsole/wineconsole.exe$(DLLEXT): wineconsole -winedbg/winedbg.exe$(DLLEXT): winedbg -winefile/winefile.exe$(DLLEXT): winefile -winemenubuilder/winemenubuilder.exe$(DLLEXT): winemenubuilder -winemine/winemine.exe$(DLLEXT): winemine -winepath/winepath.exe$(DLLEXT): winepath -winetest/winetest.exe$(DLLEXT): winetest -winevdm/winevdm.exe$(DLLEXT): winevdm -winhelp/winhelp.exe$(DLLEXT): winhelp -winver/winver.exe$(DLLEXT): winver -wordpad/wordpad.exe$(DLLEXT): wordpad - ### Dependencies: diff --git a/programs/make_progs b/programs/make_progs index 76c8a2e..ee871bf 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -76,6 +76,7 @@ foreach my $i (split(/\s/,$makefiles)) $module = $1; next if ($module eq "none"); ($directories{$module} = $i) =~ s/^\.\/(.*)\/[^\/]+$/$1/; + die "invalid module $module in dir $directories{$module}\n" if "$directories{$module}.exe" ne $module; last; } if (/^PROGRAMS\s*=((\s*[a-zA-Z0-9_.]+)+)/) @@ -133,12 +134,6 @@ foreach my $dir (sort keys %alldirs) printf NEWMAKE " \\\n\t%s", $dir if $bin_install{$dir}; } -print NEWMAKE "\n\n# Symlinks to apps that we want to run from inside the source tree\nSYMLINKS ="; -foreach my $mod (sort keys %directories) -{ - printf NEWMAKE " \\\n\t%s\$(DLLEXT)", $mod; -} - ################################################################ # output the build and install targets @@ -147,7 +142,7 @@ print NEWMAKE <<EOF; \@MAKE_RULES\@ -all: wineapploader winelauncher \$(SUBDIRS) \$(SYMLINKS) +all: wineapploader winelauncher \$(SUBDIRS) wineapploader: wineapploader.in sed -e 's,\@bindir\\\@,\$(bindir),g' \$(SRCDIR)/wineapploader.in >\$\@ || (\$(RM) \$\@ && false) @@ -180,36 +175,15 @@ uninstall:: -rmdir \$(DESTDIR)\$(dlldir) clean:: - \$(RM) wineapploader winelauncher \$(SYMLINKS) + \$(RM) wineapploader winelauncher # Rules for testing check test:: \$(SUBDIRS:%=%/__test__) +### Dependencies: EOF -################################################################ -# output the symlinks rules - -print NEWMAKE "# Rules for symlinks\n\n"; - -foreach my $mod (sort keys %directories) -{ - printf NEWMAKE "%s\$(DLLEXT)", $mod; - printf NEWMAKE ": %s/%s\$(DLLEXT)\n", $directories{$mod}, $mod; - printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s\$(DLLEXT) \$@\n\n", $directories{$mod}, $mod; -} - -foreach my $mod (sort keys %directories) -{ - printf NEWMAKE "%s/%s\$(DLLEXT): %s\n", $directories{$mod}, $mod, $directories{$mod}; -} - -################################################################ -# makefile trailer - -print NEWMAKE "\n### Dependencies:\n"; - close NEWMAKE; rename "Makefile.in.new", "Makefile.in"; printf "Successfully updated Makefile.in\n";
participants (1)
-
Alexandre Julliard