Avoid some non-portable makefile constructs, and get rid of the

dlls/Makedll.rules.in

@@ -2,7 +2,6 @@
 #
 # Each individual makefile should define the following variables:
 # MODULE       : name of the main module being built
-# ALTNAMES     : alternate names for this dll (optional)
 # EXTRALIBS    : extra libraries to link in (optional)
 # SPEC_SRCS16  : interface definition files for 16-bit dlls (optional)
 # SUBSYSTEM    : (optional) subsystem (for native dlls)
@@ -73,12 +72,19 @@ doc-sgml: $(C_SRCS)
 
 # Rules for installation
 
-WIN16_INSTALL = $(ALTNAMES:%=_install_/%$(DLLEXT))
+EXE_SPECS16 = $(SPEC_SRCS16:.exe.spec=.exe)
+DRV_SPECS16 = $(EXE_SPECS16:.drv.spec=.drv)
+ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll)
 
-.PHONY: install_lib $(WIN16_INSTALL)
+WIN16_INSTALL = $(ALL_SPECS16:%=_install_/%)
 
-$(ALTNAMES:%=_install_/%$(DLLEXT)): install_lib
-	cd $(dlldir) && $(RM) `basename $@` && $(LN_S) $(MODULE)$(DLLEXT) `basename $@`
+.PHONY: install_lib $(ALL_SPECS16:%=_install_/%) $(ALL_SPECS16:%=_uninstall_/%)
+
+$(ALL_SPECS16:%=_install_/%): install_lib
+	cd $(dlldir) && $(RM) `basename $@`$(DLLEXT) && $(LN_S) $(MODULE)$(DLLEXT) `basename $@`$(DLLEXT)
+
+$(ALL_SPECS16:%=_uninstall_/%): dummy
+	$(RM) $(dlldir)/`basename $@`$(DLLEXT)
 
 install_lib: $(MODULE)$(DLLEXT)
 	$(MKINSTALLDIRS) $(dlldir)
@@ -86,8 +92,8 @@ install_lib: $(MODULE)$(DLLEXT)
 
 install:: install_lib @WIN16_INSTALL@
 
-uninstall::
-	$(RM) $(dlldir)/$(MODULE)$(DLLEXT) $(ALTNAMES:%=$(dlldir)/%$(DLLEXT))
+uninstall:: $(ALL_SPECS16:%=_uninstall_/%)
+	$(RM) $(dlldir)/$(MODULE)$(DLLEXT)
 
 # Misc. rules
 

dlls/avifil32/Makefile.in

@@ -4,11 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32.dll
 IMPORTS   = msacm32 msvfw32 shell32 winmm ole32 user32 advapi32 kernel32
-ALTNAMES  = avifile.dll
 EXTRALIBS = -luuid
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	acmstream.c \
 	api.c \
@@ -22,6 +19,8 @@ C_SRCS = \
 	tmpfile.c \
 	wavfile.c
 
+SPEC_SRCS16 = avifile.spec
+
 RC_SRCS = \
 	rsrc.rc
 

dlls/commdlg/Makefile.in

@@ -4,11 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32.dll
 IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll
-ALTNAMES  = commdlg.dll
 EXTRALIBS = -luuid
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	cdlg32.c \
 	colordlg.c \
@@ -28,6 +25,8 @@ C_SRCS16 = \
 	generic.c \
 	printdlg16.c
 
+SPEC_SRCS16 = commdlg.spec
+
 RC_SRCS = rsrc.rc
 RC_BINSRC = cdlg_xx.rc
 RC_BINARIES = \

dlls/ctl3d/Makefile.in

@@ -4,14 +4,15 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ctl3d32.dll
 IMPORTS   = user32 kernel32
-ALTNAMES  = ctl3d.dll ctl3dv2.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = ctl3d32.c
 
 C_SRCS16 = ctl3d.c
 
+SPEC_SRCS16 = \
+	ctl3d.spec \
+	ctl3dv2.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/gdi/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi32.dll
 IMPORTS   = advapi32 kernel32 ntdll
-ALTNAMES  = gdi.exe dispdib.dll wing.dll
 EXTRAINCL = @FREETYPEINCL@
 EXTRALIBS = $(LIBUNICODE) @ICULIBS@
 

dlls/imm32/Makefile.in

@@ -4,13 +4,12 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = imm32.dll
 IMPORTS   = user32 gdi32 kernel32
-ALTNAMES  = imm.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	imm.c
 
+SPEC_SRCS16 = imm.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/kernel/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = kernel32.dll
 IMPORTS   = ntdll
-ALTNAMES  = krnl386.exe comm.drv stress.dll system.drv toolhelp.dll windebug.dll win87em.dll
 EXTRALIBS = $(LIBUNICODE)
 
 SPEC_SRCS16 = \

dlls/lzexpand/Makefile.in

@@ -4,13 +4,11 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = lz32.dll
 IMPORTS   = kernel32
-ALTNAMES  = lzexpand.dll
 EXTRALIBS = $(LIBUNICODE)
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS   = lzexpand_main.c
 C_SRCS16 = lzexpand16.c
+SPEC_SRCS16 = lzexpand.spec
 
 @MAKE_DLL_RULES@
 

dlls/msacm/Makefile.in

@@ -4,11 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msacm32.dll
 IMPORTS   = winmm user32 advapi32 kernel32
-ALTNAMES  = msacm.dll
 EXTRALIBS = $(LIBUNICODE)
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	driver.c \
 	filter.c \
@@ -21,6 +18,8 @@ C_SRCS = \
 C_SRCS16 = \
 	msacm_main.c
 
+SPEC_SRCS16 = msacm.spec
+
 RC_SRCS = msacm.rc
 
 SUBDIRS = tests

dlls/msvideo/Makefile.in

@@ -4,11 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32.dll
 IMPORTS   = winmm comctl32 version user32 gdi32 advapi32 kernel32 ntdll
-ALTNAMES  = msvideo.dll
 EXTRALIBS = $(LIBUNICODE)
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	mciwnd.c \
 	msvideo_main.c \
@@ -17,6 +14,8 @@ C_SRCS = \
 C_SRCS16 = \
 	msvideo16.c
 
+SPEC_SRCS16 = msvideo.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/ole32/Makefile.in

@@ -5,11 +5,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ole32.dll
 IMPORTS   = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
-ALTNAMES  = ole2.dll ole2nls.dll ole2conv.dll ole2prox.dll ole2thk.dll storage.dll compobj.dll
 EXTRALIBS = -luuid
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	antimoniker.c \
 	bindctx.c \
@@ -47,6 +44,15 @@ C_SRCS16 = \
 	ole2nls.c \
 	storage.c
 
+SPEC_SRCS16 = \
+	compobj.spec \
+	ole2.spec \
+	ole2conv.spec \
+	ole2nls.spec \
+	ole2prox.spec \
+	ole2thk.spec \
+	storage.spec
+
 RC_SRCS = ole32res.rc version.rc
 RC_BINSRC = ole32res.rc
 RC_BINARIES = \

dlls/oleaut32/Makefile.in

@@ -6,11 +6,8 @@ VPATH     = @srcdir@
 MODULE    = oleaut32.dll
 IMPORTS   = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = comctl32
-ALTNAMES  = ole2disp.dll typelib.dll
 EXTRALIBS = $(LIBUNICODE) -luuid
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	connpt.c \
 	dispatch.c \
@@ -34,6 +31,10 @@ C_SRCS16 = \
 	ole2disp.c \
 	typelib16.c
 
+SPEC_SRCS16 = \
+	ole2disp.spec \
+	typelib.spec
+
 RC_SRCS = \
 	oleaut32.rc \
 	version.rc

dlls/olecli/Makefile.in

@@ -4,9 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olecli32.dll
 IMPORTS   = ole32 gdi32 kernel32
-ALTNAMES  = olecli.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	olecli_main.c
@@ -14,6 +11,8 @@ C_SRCS = \
 C_SRCS16 = \
 	olecli16.c
 
+SPEC_SRCS16 = olecli.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/olesvr/Makefile.in

@@ -4,14 +4,12 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = olesvr32.dll
 IMPORTS   = kernel32
-ALTNAMES  = olesvr.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	olesvr_main.c
 
+SPEC_SRCS16 = olesvr.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:
-

dlls/rasapi32/Makefile.in

@@ -4,12 +4,11 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = rasapi32.dll
 IMPORTS   = kernel32
-ALTNAMES  = rasapi16.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = rasapi.c
 
+SPEC_SRCS16 = rasapi16.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/setupapi/Makefile.in

@@ -6,11 +6,8 @@ VPATH     = @srcdir@
 MODULE    = setupapi.dll
 IMPORTS   = user32 version advapi32 kernel32 ntdll
 DELAYIMPORTS = shell32
-ALTNAMES  = setupx.dll
 EXTRALIBS = $(LIBUNICODE)
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	devinst.c \
 	dirid.c \
@@ -27,6 +24,8 @@ C_SRCS16 = \
 	setupx_main.c \
 	virtcopy.c
 
+SPEC_SRCS16 = setupx.spec
+
 RC_SRCS= setupapi.rc
 
 @MAKE_DLL_RULES@

dlls/shell32/Makefile.in

@@ -6,11 +6,8 @@ VPATH     = @srcdir@
 MODULE    = shell32.dll
 IMPORTS   = shlwapi comctl32 user32 gdi32 advapi32 kernel32
 DELAYIMPORTS = ole32
-ALTNAMES  = shell.dll
 EXTRALIBS = -luuid $(LIBUNICODE)
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	authors.c \
 	autocomplete.c \
@@ -63,6 +60,7 @@ RC_BINARIES = \
 
 C_SRCS16  = shell.c
 RC_SRCS16 = version16.rc
+SPEC_SRCS16 = shell.spec
 
 SUBDIRS = tests
 

dlls/twain/Makefile.in

@@ -3,13 +3,10 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = twain_32.dll
-ALTNAMES  = twain.dll
 IMPORTS   = user32 gdi32 kernel32 ntdll
 EXTRALIBS = @SANELIBS@
 EXTRAINCL = @SANEINCL@
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	capability.c \
 	ds_audio.c \
@@ -21,6 +18,8 @@ C_SRCS = \
 C_SRCS16 = \
 	twain16_main.c
 
+SPEC_SRCS16 = twain.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/user/Makefile.in

@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32.dll
 IMPORTS   = gdi32 advapi32 kernel32 ntdll
-ALTNAMES  = user.exe ddeml.dll display.drv keyboard.drv mouse.drv
 EXTRALIBS = $(LIBUNICODE)
 
 SPEC_SRCS16 = \

dlls/version/Makefile.in

@@ -4,11 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version.dll
 IMPORTS   = lz32 kernel32 ntdll
-ALTNAMES  = ver.dll
 EXTRALIBS = $(LIBUNICODE)
 
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
-
 C_SRCS = \
 	info.c \
 	install.c \
@@ -17,6 +14,8 @@ C_SRCS = \
 C_SRCS16 = \
 	ver16.c
 
+SPEC_SRCS16 = ver.spec
+
 SUBDIRS = tests
 
 @MAKE_DLL_RULES@

dlls/win32s/Makefile.in

@@ -4,9 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = w32skrnl.dll
 IMPORTS   = kernel32
-ALTNAMES  = w32sys.dll win32s16.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	w32skernel.c \
@@ -15,6 +12,10 @@ C_SRCS = \
 C_SRCS16 = \
 	win32s16.c
 
+SPEC_SRCS16 = \
+	w32sys.spec \
+	win32s16.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/winaspi/Makefile.in

@@ -4,9 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wnaspi32.dll
 IMPORTS   = advapi32 kernel32
-ALTNAMES  = winaspi.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	aspi.c \
@@ -15,6 +12,8 @@ C_SRCS = \
 C_SRCS16 = \
 	winaspi16.c
 
+SPEC_SRCS16 = winaspi.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/winedos/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winedos.dll
 IMPORTS   = user32 advapi32 kernel32 ntdll
-ALTNAMES  = wprocs.dll
 EXTRALIBS = $(LIBUNICODE)
 
 SPEC_SRCS16 = wprocs.spec

dlls/wineps/Makefile.in

@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wineps.dll
 IMPORTS   = user32 gdi32 winspool advapi32 kernel32
-ALTNAMES  = wineps16.drv
 EXTRAINCL = @FREETYPEINCL@
 
 SPEC_SRCS16 = wineps16.drv.spec

dlls/winmm/Makefile.in

@@ -5,9 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winmm.dll
 IMPORTS   = user32 advapi32 kernel32 ntdll
-ALTNAMES  = mmsystem.dll sound.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	driver.c \
@@ -24,6 +21,10 @@ C_SRCS16 = \
 	mmsystem.c \
 	sound16.c
 
+SPEC_SRCS16 = \
+	mmsystem.spec \
+	sound.spec
+
 RC_SRCS = winmm_res.rc
 
 SUBDIRS = tests

dlls/winnls/Makefile.in

@@ -4,13 +4,12 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winnls32.dll
 IMPORTS   = kernel32
-ALTNAMES  = winnls.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	winnls.c
 
+SPEC_SRCS16 = winnls.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/winsock/Makefile.in

@@ -5,9 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = ws2_32.dll
 IMPORTS   = user32 iphlpapi kernel32 ntdll
-ALTNAMES  = winsock.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	async.c \
@@ -15,6 +12,8 @@ C_SRCS = \
 
 C_SRCS16 = socket16.c
 
+SPEC_SRCS16 = winsock.spec
+
 RC_SRCS = version.rc
 
 SUBDIRS = tests

dlls/wintab32/Makefile.in

@@ -4,9 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = wintab32.dll
 IMPORTS   = user32 kernel32
-ALTNAMES  = wintab.dll
-
-SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
 
 C_SRCS = \
 	context.c \
@@ -16,6 +13,8 @@ C_SRCS = \
 C_SRCS16 = \
 	wintab16.c
 
+SPEC_SRCS16 = wintab.spec
+
 @MAKE_DLL_RULES@
 
 ### Dependencies: