For dlls, derive SPEC_SRCS from MODULE and ALTNAMES.

dlls/Makedll.rules.in

@@ -16,6 +16,7 @@ LDSHARED   = @LDSHARED@
 SONAME     = lib$(MODULE).so
 IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT))
 ALLNAMES   = lib$(MODULE).so $(ALTNAMES:%=lib%.so)
+SPEC_SRCS  = $(MODULE).spec $(ALTNAMES:%=%.spec)
 
 all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%=lib%.$(LIBEXT))
 

dlls/avifil32/Makefile.in

@@ -7,8 +7,6 @@ SOVERSION = 1.0
 ALTNAMES  = avifile
 IMPORTS   = msvfw32 winmm
 
-SPEC_SRCS = avifil32.spec avifile.spec
-
 C_SRCS = \
 	avifile.c
 

dlls/comctl32/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = comctl32
 SOVERSION = 1.0
 WRCEXTRA  = -s -p$(MODULE)
 
-SPEC_SRCS = comctl32.spec
-
 C_SRCS = \
 	animate.c \
 	comboex.c \

dlls/commdlg/Makefile.in

@@ -8,8 +8,6 @@ ALTNAMES  = commdlg
 IMPORTS   = winspool.drv
 WRCEXTRA  = -s -pcomdlg32
 
-SPEC_SRCS = commdlg.spec comdlg32.spec
-
 C_SRCS = \
 	cdlg32.c \
 	colordlg.c \

dlls/dciman32/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = dciman32
 SOVERSION = 1.0
 
-SPEC_SRCS = dciman32.spec
-
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/ddraw/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = ddraw
 SOVERSION = 1.0
 IMPORTS   = x11drv
 
-SPEC_SRCS = ddraw.spec
-
-
 MESA_SRCS = \
 	d3dcommon.c \
 	d3ddevice/mesa.c \

dlls/dinput/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = dinput
 SOVERSION = 1.0
 IMPORTS   = user32
 
-SPEC_SRCS = dinput.spec
-
 C_SRCS = \
 	dinput_main.c
 

dlls/dplayx/Makefile.in

@@ -7,8 +7,6 @@ SOVERSION = 1.0
 ALTNAMES  = dplay
 IMPORTS   = ole32
 
-SPEC_SRCS = dplay.spec dplayx.spec 
-
 C_SRCS = dplay.c \
          dplobby.c \
          dpclassfactory.c \

dlls/dsound/Makefile.in

@@ -5,9 +5,6 @@ VPATH     = @srcdir@
 MODULE    = dsound
 SOVERSION = 1.0
 
-SPEC_SRCS = \
-	dsound.spec
-
 C_SRCS = \
 	dsound_main.c
 

dlls/gdi/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = gdi32
 SOVERSION = 1.0
 ALTNAMES  = gdi dispdib
 
-SPEC_SRCS = gdi32.spec gdi.spec dispdib.spec
-
 C_SRCS = \
 	gdi_main.c \
 	thunk.c

dlls/icmp/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = icmp
 SOVERSION = 1.0
 
-SPEC_SRCS = icmp.spec
-
 C_SRCS = icmp_main.c 
 
 @MAKE_DLL_RULES@

dlls/imagehlp/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = imagehlp
 SOVERSION = 1.0
 
-SPEC_SRCS = imagehlp.spec
-
 C_SRCS = \
 	access.c \
 	debug.c \

dlls/imm32/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = imm32
 SOVERSION = 1.0
 
-SPEC_SRCS = imm32.spec
-
 C_SRCS = \
 	imm.c
 

dlls/kernel/Makefile.in

@@ -6,15 +6,6 @@ MODULE    = kernel32
 SOVERSION = 1.0
 ALTNAMES  = wow32 comm kernel system toolhelp wprocs
 
-SPEC_SRCS = \
-	kernel32.spec \
-	wow32.spec \
-	comm.spec \
-	kernel.spec \
-	system.spec \
-	toolhelp.spec \
-	wprocs.spec
-
 C_SRCS = \
 	kernel_main.c
 

dlls/lzexpand/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = lz32
 SOVERSION = 1.0
 ALTNAMES  = lzexpand
 
-SPEC_SRCS = lz32.spec lzexpand.spec
-
 C_SRCS = \
 	lzexpand_main.c
 

dlls/mpr/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = mpr
 SOVERSION = 1.0
 
-SPEC_SRCS = mpr.spec
-
 C_SRCS = \
 	auth.c \
 	mpr_main.c \

dlls/msacm/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = msacm
 SOVERSION = 1.0
 
-SPEC_SRCS = msacm.spec
-
 C_SRCS = \
 	msacm_main.c
 

dlls/msacm32/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = msacm32
 SOVERSION = 1.0
 
-SPEC_SRCS = msacm32.spec
-
 C_SRCS = \
 	driver.c \
 	filter.c \

dlls/msnet32/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = msnet32
 SOVERSION = 1.0
 
-SPEC_SRCS = msnet32.spec
-
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/msvideo/Makefile.in

@@ -7,8 +7,6 @@ SOVERSION = 1.0
 ALTNAMES  = msvideo
 IMPORTS   = winmm
 
-SPEC_SRCS = msvfw32.spec msvideo.spec
-
 C_SRCS = \
 	msvideo_main.c
 

dlls/odbc32/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = odbc32
 SOVERSION = 1.0
 
-SPEC_SRCS = odbc32.spec
-
 C_SRCS = \
 	proxyodbc.c 
 

dlls/ole32/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = ole32
 SOVERSION = 1.0
 ALTNAMES  = ole2 ole2nls ole2conv ole2prox ole2thk storage compobj
 
-SPEC_SRCS = ole32.spec ole2.spec ole2conv.spec ole2nls.spec \
-	    ole2prox.spec ole2thk.spec storage.spec compobj.spec
-
 C_SRCS = \
 	antimoniker.c \
 	bindctx.c \

dlls/oleaut32/Makefile.in

@@ -7,8 +7,6 @@ SOVERSION = 1.0
 ALTNAMES  = ole2disp typelib
 IMPORTS   = ole32 comctl32
 
-SPEC_SRCS = oleaut32.spec ole2disp.spec typelib.spec
-
 C_SRCS = \
 	ole2disp.c \
 	oleaut.c \

dlls/olecli/Makefile.in

@@ -7,8 +7,6 @@ SOVERSION = 1.0
 ALTNAMES  = olecli
 IMPORTS   = olesvr32 ole32
 
-SPEC_SRCS = olecli32.spec olecli.spec
-
 C_SRCS = \
 	olecli_main.c
 

dlls/oledlg/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = oledlg
 SOVERSION = 1.0
 
-SPEC_SRCS = oledlg.spec
-
 C_SRCS = \
 	oledlg_main.c
 

dlls/olepro32/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = olepro32
 SOVERSION = 1.0
 IMPORTS	  = oleaut32 ole32
 
-SPEC_SRCS = olepro32.spec
-
 C_SRCS = olepro32stubs.c
 
 @MAKE_DLL_RULES@

dlls/olesvr/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = olesvr32
 SOVERSION = 1.0
 ALTNAMES  = olesvr
 
-SPEC_SRCS = olesvr32.spec olesvr.spec
-
 C_SRCS = \
 	olesvr_main.c
 

dlls/opengl32/Makefile.in

@@ -8,8 +8,6 @@ IMPORTS   = \
 	x11drv \
 	gdi32
 
-SPEC_SRCS = opengl32.spec
-
 C_SRCS = \
 	wgl.c \
 	opengl_norm.c \

dlls/psapi/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = psapi
 SOVERSION = 1.0
 
-SPEC_SRCS = psapi.spec
-
 C_SRCS = \
 	psapi_main.c
 

dlls/rasapi32/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = rasapi32
 SOVERSION = 1.0
 ALTNAMES  = rasapi16
 
-SPEC_SRCS = rasapi32.spec rasapi16.spec
-
 C_SRCS = rasapi.c 
 
 @MAKE_DLL_RULES@

dlls/richedit/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = riched32
 SOVERSION = 1.0
 
-SPEC_SRCS = riched32.spec
-
 C_SRCS = \
 	charlist.c \
 	reader.c \

dlls/setupx/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = setupx
 SOVERSION = 1.0
 
-SPEC_SRCS = setupx.spec
-
 C_SRCS = \
 	setupx_main.c
 

dlls/shell32/Makefile.in

@@ -7,12 +7,6 @@ SOVERSION = 1.0
 ALTNAMES  = shell shlwapi shfolder
 IMPORTS   = ole32
 
-SPEC_SRCS = \
-	shell.spec \
-	shell32.spec \
-	shlwapi.spec \
-	shfolder.spec
-
 C_SRCS = \
 	brsfolder.c \
 	changenotify.c \

dlls/sound/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = sound
 SOVERSION = 1.0
 
-SPEC_SRCS = sound.spec
-
 C_SRCS = \
 	sound_main.c
 

dlls/stress/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = stress
 SOVERSION = 1.0
 
-SPEC_SRCS = stress.spec
-
 C_SRCS = \
 	stress_main.c
 

dlls/tapi32/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = tapi32
 SOVERSION = 1.0
 
-SPEC_SRCS = tapi32.spec
-
 C_SRCS = \
 	assisted.c \
 	line.c \

dlls/ttydrv/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = ttydrv
 SOVERSION = 1.0
 EXTRALIBS = $(LIBS)
 
-SPEC_SRCS = ttydrv.spec
-
 C_SRCS = \
 	ttydrv_main.c
 

dlls/urlmon/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = urlmon
 SOVERSION = 1.0
 IMPORTS   = ole32
 
-SPEC_SRCS = urlmon.spec
-
 C_SRCS = \
 	umon.c \
 	urlmon_main.c

dlls/user/Makefile.in

@@ -7,14 +7,6 @@ SOVERSION = 1.0
 WRCEXTRA  = -w16 -m
 ALTNAMES  = user keyboard ddeml display mouse
 
-SPEC_SRCS = \
-	user32.spec \
-	user.spec \
-	keyboard.spec \
-	ddeml.spec \
-	display.spec \
-	mouse.spec
-
 C_SRCS = \
 	ddeml.c \
 	display.c \

dlls/version/Makefile.in

@@ -7,8 +7,6 @@ SOVERSION = 1.0
 ALTNAMES  = ver
 IMPORTS   = lz32
 
-SPEC_SRCS = ver.spec version.spec
-
 C_SRCS = \
 	info.c \
 	install.c \

dlls/win32s/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = w32skrnl
 SOVERSION = 1.0
 ALTNAMES  = w32sys win32s16
 
-SPEC_SRCS = w32sys.spec win32s16.spec w32skrnl.spec
-
 C_SRCS = \
 	w32skernel.c \
 	w32sys.c \

dlls/win87em/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = win87em
 SOVERSION = 1.0
 
-SPEC_SRCS = win87em.spec
-
 C_SRCS = \
 	emulate.c
 

dlls/winaspi/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = wnaspi32
 SOVERSION = 1.0
 ALTNAMES  = winaspi
 
-SPEC_SRCS = wnaspi32.spec winaspi.spec
-
 C_SRCS = \
 	aspi.c \
 	winaspi16.c \

dlls/windebug/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = windebug
 SOVERSION = 1.0
 
-SPEC_SRCS = windebug.spec
-
 C_SRCS = \
 	windebug_main.c
 

dlls/wineps/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = wineps
 SOVERSION = 1.0
 ALTNAMES  = wineps16
 
-SPEC_SRCS = wineps.spec wineps16.spec
-
 C_SRCS = \
 	afm.c \
 	bitblt.c \

dlls/wing/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = wing
 SOVERSION = 1.0
 
-SPEC_SRCS = wing.spec
-
 C_SRCS = \
 	wing_main.c
 

dlls/wininet/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = wininet
 SOVERSION = 1.0
 
-SPEC_SRCS = wininet.spec
-
 C_SRCS = \
 	http.c \
 	internet.c \

dlls/winmm/Makefile.in

@@ -6,10 +6,6 @@ MODULE    = winmm
 SOVERSION = 1.0
 ALTNAMES  = mmsystem
 
-SPEC_SRCS = \
-	mmsystem.spec \
-	winmm.spec
-
 C_SRCS = \
 	joystick.c \
 	lolvldrv.c \

dlls/winmm/joystick/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = joystick.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	joystick.spec
-
 C_SRCS = \
 	joystick.c
 

dlls/winmm/mcianim/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = mcianim.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	mcianim.spec
-
 C_SRCS = \
 	mcianim.c
 

dlls/winmm/mciavi/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = mciavi.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	mciavi.spec
-
 C_SRCS = \
 	mciavi.c
 

dlls/winmm/mcicda/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = mcicda.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	mcicda.spec
-
 C_SRCS = \
 	mcicda.c
 

dlls/winmm/mciseq/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = mciseq.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	mciseq.spec
-
 C_SRCS = \
 	mcimidi.c
 

dlls/winmm/mciwave/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = mciwave.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	mciwave.spec
-
 C_SRCS = \
 	mciwave.c
 

dlls/winmm/midimap/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = midimap.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	midimap.spec
-
 C_SRCS = \
 	midimap.c
 

dlls/winmm/wavemap/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = msacm.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	msacm.spec
-
 C_SRCS = \
 	wavemap.c
 

dlls/winmm/wineoss/Makefile.in

@@ -6,9 +6,6 @@ MODULE    = wineoss.drv
 SOVERSION = 1.0
 IMPORTS   = winmm
 
-SPEC_SRCS = \
-	wineoss.spec
-
 C_SRCS = \
 	audio.c \
 	midi.c \

dlls/winsock/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = wsock32
 SOVERSION = 1.0
 ALTNAMES  = winsock ws2_32
 
-SPEC_SRCS = winsock.spec wsock32.spec ws2_32.spec
-
 C_SRCS = \
 	async.c \
 	socket.c

dlls/winspool/Makefile.in

@@ -5,8 +5,6 @@ VPATH     = @srcdir@
 MODULE    = winspool.drv
 SOVERSION = 1.0
 
-SPEC_SRCS = winspool.spec
-
 C_SRCS = \
 	info.c \
 	wspool.c

dlls/x11drv/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = x11drv
 SOVERSION = 1.0
 EXTRALIBS = $(X_LIBS) $(XLIB)
 
-SPEC_SRCS = x11drv.spec
-
 C_SRCS = \
 	x11drv_main.c