makefiles: Get rid of the MAKE_PROG_RULES variable.

cjacek · Jan 2, 2014 · 86b1f94 · 86b1f94
1 parent 5e7416e
commit 86b1f94
Show file tree

Hide file tree

Showing 83 changed files with 1 addition and 172 deletions.
diff --git a/configure b/configure
@@ -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
 "

diff --git 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,"

diff --git a/programs/arp/Makefile.in b/programs/arp/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole
 
 C_SRCS = \
 	cacls_main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mwindows -municode
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git a/programs/hh/Makefile.in b/programs/hh/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mwindows
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git a/programs/mshta/Makefile.in b/programs/mshta/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mwindows -municode
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole
 
 C_SRCS = \
 	ping_main.c
-
-@MAKE_PROG_RULES@
diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in
@@ -4,5 +4,3 @@ IMPORTS   = advapi32
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in
@@ -4,5 +4,3 @@ IMPORTS   = advapi32
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git a/programs/regasm/Makefile.in b/programs/regasm/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in
@@ -4,5 +4,3 @@ IMPORTS   = user32
 
 C_SRCS = \
 	rundll32.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git a/programs/schtasks/Makefile.in b/programs/schtasks/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 
 C_SRCS = \
 	schtasks.c
-
-@MAKE_PROG_RULES@
diff --git a/programs/secedit/Makefile.in b/programs/secedit/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git a/programs/servicemodelreg/Makefile.in b/programs/servicemodelreg/Makefile.in
@@ -3,5 +3,3 @@ APPMODE   = -mconsole -municode
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in
@@ -4,5 +4,3 @@ IMPORTS   = advapi32
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in
@@ -4,5 +4,3 @@ IMPORTS   = advapi32
 
 C_SRCS = \
 	svchost.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in
@@ -4,5 +4,3 @@ IMPORTS   = advapi32
 
 C_SRCS = \
 	main.c
-
-@MAKE_PROG_RULES@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
diff --git 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@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@ APPMODE = -mconsole -municode

		C_SRCS = \
		main.c

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,5 +5,3 @@ IMPORTS = user32
		C_SRCS = attrib.c

		RC_SRCS = attrib.rc

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@ APPMODE = -mconsole -municode
		IMPORTS = cabinet

		C_SRCS = cabarc.c

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@ APPMODE = -mconsole

		C_SRCS = \
		cacls_main.c

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,5 +7,3 @@ C_SRCS = \
		winclock.c

		RC_SRCS = clock.rc

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,5 +11,3 @@ C_SRCS = \
		RC_SRCS = cmd.rc

		SVG_SRCS = wcmd.svg

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,5 +4,3 @@ APPMODE = -mconsole -municode
		C_SRCS = conhost.c

		RC_SRCS = version.rc

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@ APPMODE = -mwindows -municode
		IMPORTS = shell32 user32

		C_SRCS = control.c

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,5 +8,3 @@ C_SRCS = \
		output.c

		RC_SRCS = dxdiag.rc

		@MAKE_PROG_RULES@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,3 @@ MODULE = eject.exe
		APPMODE = -mconsole

		C_SRCS = eject.c

		@MAKE_PROG_RULES@