Simplified wrc flags handling.

Make.rules.in

@@ -57,7 +57,7 @@ WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check
 BUILD     = $(TOPOBJDIR)/tools/build@PROGEXT@
 MAKEDEP   = $(TOPOBJDIR)/tools/makedep@PROGEXT@
 WRC       = $(TOPOBJDIR)/tools/wrc/wrc@PROGEXT@
-WRCFLAGS  = -c
+WRCFLAGS  = -c -s -p $*
 DLLDIR    = $(TOPOBJDIR)/dlls
 @SET_MAKE@
 

debugger/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winedbg
-WRCEXTRA  = -A -p $*
 
 C_SRCS = \
 	break.c \

dlls/richedit/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
 SOVERSION = 1.0
-WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = riched32.spec
 

dlls/shell32/Makefile.in

@@ -6,7 +6,6 @@ MODULE    = shell32
 SOVERSION = 1.0
 ALTNAMES  = shell shlwapi
 IMPORTS   = ole32
-WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = \
 	shell.spec \

dlls/shell32/shell32.spec

 name	shell32
 type	win32
 init	Shell32LibMain
-rsrc	shell32
+rsrc	shres
 
 import	user32.dll
 import	comctl32.dll

dlls/urlmon/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = urlmon
 SOVERSION = 1.0
 IMPORTS   = ole32
-WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = urlmon.spec
 

dlls/winmm/Makefile.in

@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = winmm
 SOVERSION = 1.0
 ALTNAMES  = mmsystem
-WRCEXTRA  = -s -pwinmm
 
 SPEC_SRCS = \
 	mmsystem.spec \

dlls/winmm/winmm.spec

 name winmm
 type win32
 init WINMM_LibMain
-rsrc winmm
+rsrc winmm_res
 
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA

libtest/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo
-WRCEXTRA  = -s -p $*
 
 SPEC_SRCS = \
 	expand.spec \

programs/avitools/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = icinfo aviinfo aviplay
 IMPORTS   = msvfw32 winmm ddraw x11drv
-WRCEXTRA  = -s -p $*
 
 SPEC_SRCS = \
 	icinfo.spec \

resources/Makefile.in

@@ -4,7 +4,6 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = resources
-WRCEXTRA  = -s -puser32
 
 RC_SRCS = \
 	user32.rc