makefiles: Get rid of the MAKE_PROG_RULES variable.

2014-01-02 12:08:55 +01:00 · 2014-01-02 12:08:55 +01:00 · 86b1f94d28
parent 5e7416e5c8
commit 86b1f94d28
83 changed files with 1 additions and 172 deletions
--- a/5
+++ b/5
@ -627,7 +627,6 @@ LIBOBJS
 PORCFLAGS
 LINGUAS
 MAKE_TEST_RULES
-MAKE_PROG_RULES
 MAKE_IMPLIB_RULES
 LDAPLIBS
 LIBRT
@ -16533,10 +16532,6 @@ MAKE_IMPLIB_RULES=""



-MAKE_PROG_RULES=""
-
-
-
 MAKE_TEST_RULES="
 RUNTESTFLAGS = -q -P wine
 "
--- a/configure.ac
+++ b/configure.ac
@ -2595,10 +2595,6 @@ dnl Import library rules

 AC_SUBST(MAKE_IMPLIB_RULES,"")

-dnl Dll and program rules
-
-AC_SUBST(MAKE_PROG_RULES,"")
-
 dnl Test rules

 AC_SUBST(MAKE_TEST_RULES,"
--- a/programs/arp/Makefile.in
+++ b/programs/arp/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/aspnet_regiis/Makefile.in
+++ b/programs/aspnet_regiis/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/attrib/Makefile.in
+++ b/programs/attrib/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = user32
 C_SRCS = attrib.c

 RC_SRCS = attrib.rc
-
-@MAKE_PROG_RULES@
--- a/programs/cabarc/Makefile.in
+++ b/programs/cabarc/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 IMPORTS   = cabinet

 C_SRCS = cabarc.c
-
-@MAKE_PROG_RULES@
--- a/programs/cacls/Makefile.in
+++ b/programs/cacls/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole

 C_SRCS = \
 	cacls_main.c
-
-@MAKE_PROG_RULES@
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@ -7,5 +7,3 @@ C_SRCS = \
 	winclock.c

 RC_SRCS = clock.rc
-
-@MAKE_PROG_RULES@
--- a/programs/cmd/Makefile.in
+++ b/programs/cmd/Makefile.in
@ -11,5 +11,3 @@ C_SRCS = \
 RC_SRCS = cmd.rc

 SVG_SRCS = wcmd.svg
-
-@MAKE_PROG_RULES@
--- a/programs/conhost/Makefile.in
+++ b/programs/conhost/Makefile.in
@ -4,5 +4,3 @@ APPMODE   = -mconsole -municode
 C_SRCS = conhost.c

 RC_SRCS = version.rc
-
-@MAKE_PROG_RULES@
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mwindows -municode
 IMPORTS   = shell32 user32

 C_SRCS = control.c
-
-@MAKE_PROG_RULES@
--- a/programs/cscript/Makefile.in
+++ b/programs/cscript/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mwindows -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/dxdiag/Makefile.in
+++ b/programs/dxdiag/Makefile.in
@ -8,5 +8,3 @@ C_SRCS = \
 	output.c

 RC_SRCS = dxdiag.rc
-
-@MAKE_PROG_RULES@
--- a/programs/eject/Makefile.in
+++ b/programs/eject/Makefile.in
@ -2,5 +2,3 @@ MODULE    = eject.exe
 APPMODE   = -mconsole

 C_SRCS = eject.c
-
-@MAKE_PROG_RULES@
--- a/programs/expand/Makefile.in
+++ b/programs/expand/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole
 IMPORTS   = setupapi

 C_SRCS = expand.c
-
-@MAKE_PROG_RULES@
--- a/programs/explorer/Makefile.in
+++ b/programs/explorer/Makefile.in
@ -10,5 +10,3 @@ C_SRCS = \
 	systray.c

 RC_SRCS = explorer.rc
-
-@MAKE_PROG_RULES@
--- a/programs/extrac32/Makefile.in
+++ b/programs/extrac32/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = shell32 setupapi shlwapi user32

 C_SRCS = \
 	extrac32.c
-
-@MAKE_PROG_RULES@
--- a/programs/findstr/Makefile.in
+++ b/programs/findstr/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/hh/Makefile.in
+++ b/programs/hh/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mwindows

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/hostname/Makefile.in
+++ b/programs/hostname/Makefile.in
@ -6,5 +6,3 @@ DELAYIMPORTS = user32
 C_SRCS = hostname.c

 RC_SRCS = hostname.rc
-
-@MAKE_PROG_RULES@
--- a/programs/icinfo/Makefile.in
+++ b/programs/icinfo/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 IMPORTS   = msvfw32

 C_SRCS = icinfo.c
-
-@MAKE_PROG_RULES@
--- a/programs/iexplore/Makefile.in
+++ b/programs/iexplore/Makefile.in
@ -9,5 +9,3 @@ C_SRCS = \
 RC_SRCS = iexplore.rc

 SVG_SRCS = iexplore.svg
-
-@MAKE_PROG_RULES@
--- a/programs/ipconfig/Makefile.in
+++ b/programs/ipconfig/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = iphlpapi ws2_32 user32
 C_SRCS = ipconfig.c

 RC_SRCS = ipconfig.rc
-
-@MAKE_PROG_RULES@
--- a/programs/lodctr/Makefile.in
+++ b/programs/lodctr/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole
 IMPORTS   = loadperf

 C_SRCS = lodctr_main.c
-
-@MAKE_PROG_RULES@
--- a/programs/mofcomp/Makefile.in
+++ b/programs/mofcomp/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 IMPORTS   = kernel32

 C_SRCS = mofcomp.c
-
-@MAKE_PROG_RULES@
--- a/programs/mshta/Makefile.in
+++ b/programs/mshta/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mwindows -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/msiexec/Makefile.in
+++ b/programs/msiexec/Makefile.in
@ -11,5 +11,3 @@ RC_SRCS = rsrc.rc
 MANPAGES = msiexec.man.in

 SVG_SRCS = msiexec.svg
-
-@MAKE_PROG_RULES@
--- a/programs/net/Makefile.in
+++ b/programs/net/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = netapi32 user32 advapi32
 C_SRCS = net.c

 RC_SRCS = net.rc
-
-@MAKE_PROG_RULES@
--- a/programs/netsh/Makefile.in
+++ b/programs/netsh/Makefile.in
@ -2,5 +2,3 @@ MODULE    = netsh.exe
 APPMODE   = -mconsole -municode

 C_SRCS = netsh.c
-
-@MAKE_PROG_RULES@
--- a/programs/netstat/Makefile.in
+++ b/programs/netstat/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = iphlpapi user32 ws2_32
 C_SRCS = netstat.c

 RC_SRCS = netstat.rc
-
-@MAKE_PROG_RULES@
--- a/programs/ngen/Makefile.in
+++ b/programs/ngen/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	ngen_main.c
-
-@MAKE_PROG_RULES@
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@ -14,5 +14,3 @@ RC_SRCS = notepad.rc
 MANPAGES = notepad.man.in

 SVG_SRCS = notepad.svg
-
-@MAKE_PROG_RULES@
--- a/programs/oleview/Makefile.in
+++ b/programs/oleview/Makefile.in
@ -11,5 +11,3 @@ C_SRCS = \
 	typelib.c

 RC_SRCS = oleview.rc
-
-@MAKE_PROG_RULES@
--- a/programs/ping/Makefile.in
+++ b/programs/ping/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole

 C_SRCS = \
 	ping_main.c
-
-@MAKE_PROG_RULES@
--- a/programs/plugplay/Makefile.in
+++ b/programs/plugplay/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = advapi32

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/presentationfontcache/Makefile.in
+++ b/programs/presentationfontcache/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = advapi32

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@ -11,5 +11,3 @@ C_SRCS = \
 	string.c

 RC_SRCS = progman.rc
-
-@MAKE_PROG_RULES@
--- a/programs/reg/Makefile.in
+++ b/programs/reg/Makefile.in
@ -6,5 +6,3 @@ DELAYIMPORTS = user32
 C_SRCS = reg.c

 RC_SRCS = reg.rc
-
-@MAKE_PROG_RULES@
--- a/programs/regasm/Makefile.in
+++ b/programs/regasm/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@ -23,5 +23,3 @@ RC_SRCS = regedit.rc
 MANPAGES = regedit.man.in

 SVG_SRCS = regedit.svg
-
-@MAKE_PROG_RULES@
--- a/programs/regsvcs/Makefile.in
+++ b/programs/regsvcs/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/regsvr32/Makefile.in
+++ b/programs/regsvr32/Makefile.in
@ -8,5 +8,3 @@ C_SRCS = \
 RC_SRCS = regsvr32.rc

 MANPAGES = regsvr32.man.in
-
-@MAKE_PROG_RULES@
--- a/programs/rpcss/Makefile.in
+++ b/programs/rpcss/Makefile.in
@ -10,5 +10,3 @@ C_SRCS = \
 IDL_SRCS = \
 	epm.idl \
 	irot.idl
-
-@MAKE_PROG_RULES@
--- a/programs/rundll.exe16/Makefile.in
+++ b/programs/rundll.exe16/Makefile.in
@ -2,5 +2,3 @@ MODULE    = rundll.exe16
 APPMODE   = -m16

 C_SRCS = rundll.c
-
-@MAKE_PROG_RULES@
--- a/programs/rundll32/Makefile.in
+++ b/programs/rundll32/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = user32

 C_SRCS = \
 	rundll32.c
-
-@MAKE_PROG_RULES@
--- a/programs/sc/Makefile.in
+++ b/programs/sc/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 IMPORTS   = advapi32

 C_SRCS = sc.c
-
-@MAKE_PROG_RULES@
--- a/programs/schtasks/Makefile.in
+++ b/programs/schtasks/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	schtasks.c
-
-@MAKE_PROG_RULES@
--- a/programs/secedit/Makefile.in
+++ b/programs/secedit/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/servicemodelreg/Makefile.in
+++ b/programs/servicemodelreg/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/services/Makefile.in
+++ b/programs/services/Makefile.in
@ -8,5 +8,3 @@ C_SRCS = \
 	utils.c

 IDL_SRCS = svcctl.idl
-
-@MAKE_PROG_RULES@
--- a/programs/spoolsv/Makefile.in
+++ b/programs/spoolsv/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = advapi32

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/start/Makefile.in
+++ b/programs/start/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = shell32 user32
 C_SRCS = start.c

 RC_SRCS = start.rc
-
-@MAKE_PROG_RULES@
--- a/programs/svchost/Makefile.in
+++ b/programs/svchost/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = advapi32

 C_SRCS = \
 	svchost.c
-
-@MAKE_PROG_RULES@
--- a/programs/taskkill/Makefile.in
+++ b/programs/taskkill/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = psapi user32
 C_SRCS = taskkill.c

 RC_SRCS = taskkill.rc
-
-@MAKE_PROG_RULES@
--- a/programs/tasklist/Makefile.in
+++ b/programs/tasklist/Makefile.in
@ -4,5 +4,3 @@ APPMODE   = -mconsole -municode
 C_SRCS = tasklist.c

 RC_SRCS = version.rc
-
-@MAKE_PROG_RULES@
--- a/programs/taskmgr/Makefile.in
+++ b/programs/taskmgr/Makefile.in
@ -29,5 +29,3 @@ RC_SRCS = taskmgr.rc

 SVG_SRCS = \
 	taskmgr.svg
-
-@MAKE_PROG_RULES@
--- a/programs/termsv/Makefile.in
+++ b/programs/termsv/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = advapi32

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@ -7,5 +7,3 @@ C_SRCS = \
 	main.c

 RC_SRCS = uninstaller.rc
-
-@MAKE_PROG_RULES@
--- a/programs/unlodctr/Makefile.in
+++ b/programs/unlodctr/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole
 IMPORTS   = loadperf

 C_SRCS = unlodctr_main.c
-
-@MAKE_PROG_RULES@
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@ -6,5 +6,3 @@ C_SRCS = \
 	view.c

 RC_SRCS = view.rc
-
-@MAKE_PROG_RULES@
--- a/programs/wineboot/Makefile.in
+++ b/programs/wineboot/Makefile.in
@ -10,5 +10,3 @@ C_SRCS = \
 RC_SRCS = wineboot.rc

 MANPAGES = wineboot.man.in
-
-@MAKE_PROG_RULES@
--- a/programs/winebrowser/Makefile.in
+++ b/programs/winebrowser/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = urlmon oleaut32 user32 advapi32

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@ -22,5 +22,3 @@ MANPAGES = winecfg.man.in
 SVG_SRCS = \
 	logo.svg \
 	winecfg.svg
-
-@MAKE_PROG_RULES@
--- a/programs/wineconsole/Makefile.in
+++ b/programs/wineconsole/Makefile.in
@ -13,5 +13,3 @@ C_SRCS = \
 RC_SRCS = wineconsole.rc

 MANPAGES = wineconsole.man.in
-
-@MAKE_PROG_RULES@
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@ -34,5 +34,3 @@ LEX_SRCS   = debug.l
 BISON_SRCS = dbg.y

 MANPAGES = winedbg.man.in
-
-@MAKE_PROG_RULES@
--- a/programs/winedevice/Makefile.in
+++ b/programs/winedevice/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = advapi32 ntoskrnl.exe

 C_SRCS = \
 	device.c
-
-@MAKE_PROG_RULES@
--- a/programs/winefile/Makefile.in
+++ b/programs/winefile/Makefile.in
@ -12,5 +12,3 @@ RC_SRCS = winefile.rc
 MANPAGES = winefile.man.in

 SVG_SRCS = winefile.svg
-
-@MAKE_PROG_RULES@
--- a/programs/winemenubuilder/Makefile.in
+++ b/programs/winemenubuilder/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32

 C_SRCS = \
 	winemenubuilder.c
-
-@MAKE_PROG_RULES@
--- a/programs/winemine/Makefile.in
+++ b/programs/winemine/Makefile.in
@ -12,5 +12,3 @@ RC_SRCS = winemine.rc
 MANPAGES = winemine.man.in

 SVG_SRCS = winemine.svg
-
-@MAKE_PROG_RULES@
--- a/programs/winemsibuilder/Makefile.in
+++ b/programs/winemsibuilder/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 IMPORTS   = msi ole32

 C_SRCS = main.c
-
-@MAKE_PROG_RULES@
--- a/programs/winepath/Makefile.in
+++ b/programs/winepath/Makefile.in
@ -4,5 +4,3 @@ APPMODE   = -mconsole -municode
 C_SRCS = winepath.c

 MANPAGES = winepath.man.in
-
-@MAKE_PROG_RULES@
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@ -25,6 +25,4 @@ build.nfo:
 	-$(CC) -v 2>$@

 build.res: build.rc build.nfo
-	$(WRC) $(RCFLAGS) -o $@ build.rc
-
-@MAKE_PROG_RULES@
+	$(WRC) -o $@ build.rc
--- a/programs/winevdm/Makefile.in
+++ b/programs/winevdm/Makefile.in
@ -4,5 +4,3 @@ IMPORTS   = user32 kernel

 C_SRCS = \
 	winevdm.c
-
-@MAKE_PROG_RULES@
--- a/programs/winhelp.exe16/Makefile.in
+++ b/programs/winhelp.exe16/Makefile.in
@ -2,5 +2,3 @@ MODULE    = winhelp.exe16
 APPMODE   = -m16

 C_SRCS = winhelp.c
-
-@MAKE_PROG_RULES@
--- a/programs/winhlp32/Makefile.in
+++ b/programs/winhlp32/Makefile.in
@ -15,5 +15,3 @@ LEX_SRCS = macro.lex.l
 RC_SRCS = winhlp32.rc

 SVG_SRCS = winhelp.svg
-
-@MAKE_PROG_RULES@
--- a/programs/winoldap.mod16/Makefile.in
+++ b/programs/winoldap.mod16/Makefile.in
@ -2,5 +2,3 @@ MODULE    = winoldap.mod16
 APPMODE   = -m16

 C_SRCS = winoldap.c
-
-@MAKE_PROG_RULES@
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = shell32
 C_SRCS = winver.c

 RC_SRCS = version.rc
-
-@MAKE_PROG_RULES@
--- a/programs/wmic/Makefile.in
+++ b/programs/wmic/Makefile.in
@ -6,5 +6,3 @@ C_SRCS = \
 	main.c

 RC_SRCS = wmic.rc
-
-@MAKE_PROG_RULES@
--- a/programs/wordpad/Makefile.in
+++ b/programs/wordpad/Makefile.in
@ -17,5 +17,3 @@ SVG_SRCS = \
 	formatbar.svg \
 	toolbar.svg \
 	wordpad.svg
-
-@MAKE_PROG_RULES@
--- a/programs/write/Makefile.in
+++ b/programs/write/Makefile.in
@ -5,5 +5,3 @@ IMPORTS   = user32 gdi32
 C_SRCS = write.c

 RC_SRCS = write.rc
-
-@MAKE_PROG_RULES@
--- a/programs/wscript/Makefile.in
+++ b/programs/wscript/Makefile.in
@ -11,5 +11,3 @@ C_SRCS = \
 	main.c

 IDL_SRCS = ihost.idl
-
-@MAKE_PROG_RULES@
--- a/programs/wusa/Makefile.in
+++ b/programs/wusa/Makefile.in
@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode

 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
--- a/programs/xcopy/Makefile.in
+++ b/programs/xcopy/Makefile.in
@ -8,5 +8,3 @@ C_SRCS = \
 	xcopy.c

 RC_SRCS = xcopy.rc
-
-@MAKE_PROG_RULES@