List 16-bit spec files explicitly to avoid problems with some versions

Make.rules.in

@@ -10,7 +10,6 @@
 # C_SRCS       : C sources for the module
 # C_SRCS16     : 16-bit C sources for the module
 # RC_SRCS      : resource source files
-# SPEC_SRCS    : interface definition files
 # EXTRA_SRCS   : extra source files for make depend
 # EXTRA_OBJS   : extra object files
 # IMPORTS      : dlls to import
@@ -154,7 +153,7 @@ $(MODULE).dbg.c: $(C_SRCS) $(C_SRCS16) $(WINEBUILD)
 
 # Rule to rebuild the tools
 
-$(MAKEDEP) $(WIDL) $(WINEBUILD) $(WMC) $(WRC):
+$(MAKEDEP):
 	cd $(TOOLSDIR)/tools && $(MAKE) `basename $@`
 
 # Rules for makefile
@@ -163,28 +162,6 @@ Makefile: Makefile.in $(TOPSRCDIR)/configure
 	@echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure
 	@exit 1
 
-# Rules for auto documentation
-
-$(SUBDIRS:%=%/__man__): dummy
-	cd `dirname $@` && $(MAKE) man
-
-man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
-	$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man$(api_manext) && $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -S$(api_manext) $(DIVINCL) $(MAINSPEC:%=-w %) $(SPEC_SRCS:%=-w %) $(C_SRCS) $(C_SRCS16)
-
-$(SUBDIRS:%=%/__doc_html__): dummy
-	cd `dirname $@` && $(MAKE) doc-html
-
-doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
-	$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html && $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) $(DIVINCL) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS:%=-w %) $(C_SRCS) $(C_SRCS16)
-
-$(SUBDIRS:%=%/__doc_sgml__): dummy
-	cd `dirname $@` && $(MAKE) doc-sgml
-
-doc-sgml: $(C_SRCS) $(SUBDIRS:%=%/__doc_sgml__)
-	$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/api-guide && $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) $(DIVINCL) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS:%=-w %) $(C_SRCS) $(C_SRCS16)
-
-.PHONY: man doc-html doc-sgml $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) $(SUBDIRS:%=%/__doc_sgml__)
-
 # Rule for linting
 
 $(MODULE).ln : $(LINTS)
@@ -274,8 +251,6 @@ $(SUBDIRS:%=%/__crosstest__): dummy
 
 # Misc. rules
 
-$(SPEC_SRCS:.spec=.spec.c): $(WINEBUILD)
-
 $(RC_SRCS:.rc=.res): $(WRC)
 
 $(RC_SRCS16:.rc=.res): $(WRC)

Makefile.in

@@ -133,7 +133,7 @@ tags ctags:
 
 manpages:
 	$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/man3w
-	for i in $(SUBDIRS); do (cd $$i && $(MAKE) man); done
+	cd dlls && $(MAKE) man
 
 htmlpages:
 	$(MKINSTALLDIRS) $(TOPOBJDIR)/documentation/html

dlls/Makedll.rules.in

@@ -4,17 +4,16 @@
 # 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)
 #
 # plus all variables required by the global Make.rules.in
 #
 
 DEFS        = @DLLFLAGS@ -D__WINESRC__ $(EXTRADEFS)
 DLLEXT      = @DLLEXT@
-ALTSPECS    = $(ALTNAMES:%.dll=%)
-SPEC_SRCS   = $(ALTSPECS:%=%.spec)
 MAINSPEC    = $(MODULE:%.dll=%).spec
 SPEC_DEF    = $(MAINSPEC).def
-WIN16_FILES = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
+WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
 ALL_OBJS    = @WIN16_FILES@ $(OBJS) $(MODULE).dbg.o
 ALL_LIBS    = $(LIBWINE) $(EXTRALIBS) $(LIBPORT) $(LIBS)
 IMPORTLIBS  = $(DELAYIMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT)) $(IMPORTS:%=$(DLLDIR)/lib%.$(IMPLIBEXT))
@@ -66,6 +65,28 @@ check test:: $(SUBDIRS:%=%/__test__)
 
 crosstest:: $(SUBDIRS:%=%/__crosstest__)
 
+# Rules for auto documentation
+
+$(SUBDIRS:%=%/__man__): dummy
+	cd `dirname $@` && $(MAKE) man
+
+man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
+	$(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -S$(api_manext) $(DIVINCL) $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
+
+$(SUBDIRS:%=%/__doc_html__): dummy
+	cd `dirname $@` && $(MAKE) doc-html
+
+doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
+	$(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) $(DIVINCL) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
+
+$(SUBDIRS:%=%/__doc_sgml__): dummy
+	cd `dirname $@` && $(MAKE) doc-sgml
+
+doc-sgml: $(C_SRCS) $(SUBDIRS:%=%/__doc_sgml__)
+	$(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) $(DIVINCL) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
+
+.PHONY: man doc-html doc-sgml $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) $(SUBDIRS:%=%/__doc_sgml__)
+
 # Sanity check
 
 Makedll.rules: $(TOPSRCDIR)/dlls/Makedll.rules.in $(TOPSRCDIR)/configure
@@ -90,4 +111,8 @@ install:: install_lib @WIN16_INSTALL@
 uninstall::
 	$(RM) $(dlldir)/$(MODULE)$(DLLEXT) $(ALTNAMES:%=$(dlldir)/%$(DLLEXT))
 
+# Misc. rules
+
+$(SPEC_SRCS16:.spec=.spec.c): $(WINEBUILD)
+
 # End of global dll rules

dlls/avifil32/Makefile.in

@@ -10,6 +10,8 @@ EXTRALIBS = $(LIBUUID)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	acmstream.c \
 	api.c \

dlls/commdlg/Makefile.in

@@ -10,6 +10,8 @@ EXTRALIBS = $(LIBUUID)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	cdlg32.c \
 	colordlg.c \

dlls/ctl3d/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = ctl3d.dll ctl3dv2.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = ctl3d32.c
 
 C_SRCS16 = ctl3d.c

dlls/gdi/Makefile.in

@@ -12,6 +12,11 @@ EXTRALIBS = $(LIBUNICODE)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = \
+	dispdib.spec \
+	gdi.exe.spec \
+	wing.spec
+
 C_SRCS = \
 	$(TOPOBJDIR)/graphics/bitblt.c \
 	$(TOPOBJDIR)/graphics/dispdib.c \

dlls/imm32/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = imm.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	imm.c
 

dlls/kernel/Makefile.in

@@ -9,6 +9,16 @@ ALTNAMES  = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll
 LDIMPORTS = ntdll.dll
 DLLMAIN   = MAIN_KernelInit
 
+SPEC_SRCS16 = \
+	comm.spec \
+	krnl386.exe.spec \
+	stress.spec \
+	system.spec \
+	toolhelp.spec \
+	win87em.spec \
+	windebug.spec \
+	wprocs.spec
+
 C_SRCS = \
 	$(TOPOBJDIR)/ole/ole2nls.c \
 	comm.c \

dlls/lzexpand/Makefile.in

@@ -10,6 +10,8 @@ EXTRALIBS = $(LIBUNICODE)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS   = lzexpand_main.c
 C_SRCS16 = lzexpand16.c
 

dlls/msacm/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = msacm.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	driver.c \
 	filter.c \

dlls/msvideo/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = msvideo.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	mciwnd.c \
 	msvideo_main.c \

dlls/ole32/Makefile.in

@@ -11,6 +11,8 @@ EXTRALIBS = $(LIBUUID)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	antimoniker.c \
 	bindctx.c \

dlls/oleaut32/Makefile.in

@@ -12,6 +12,8 @@ EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @GIFLIB@ @JPEGLIB@
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	connpt.c \
 	dispatch.c \

dlls/olecli/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = olecli.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	olecli_main.c
 

dlls/olesvr/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = olesvr.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	olesvr_main.c
 

dlls/rasapi32/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = rasapi16.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = rasapi.c
 
 @MAKE_DLL_RULES@

dlls/setupapi/Makefile.in

@@ -11,6 +11,8 @@ EXTRALIBS = $(LIBUNICODE)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	devinst.c \
 	dirid.c \

dlls/shell32/Makefile.in

@@ -12,6 +12,8 @@ EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	brsfolder.c \
 	changenotify.c \

dlls/user/Makefile.in

@@ -12,6 +12,13 @@ DLLMAIN   = UserClientDllInitialize
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = \
+	ddeml.spec \
+	display.spec \
+	keyboard.spec \
+	mouse.spec \
+	user.exe.spec
+
 C_SRCS = \
 	$(TOPOBJDIR)/controls/button.c \
 	$(TOPOBJDIR)/controls/combo.c \

dlls/version/Makefile.in

@@ -10,6 +10,8 @@ EXTRALIBS = $(LIBUNICODE)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	info.c \
 	install.c \

dlls/win32s/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = w32sys.dll win32s16.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	w32skernel.c \
 	w32sys.c

dlls/winaspi/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = winaspi.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	aspi.c \
 	winaspi32.c

dlls/wineps/Makefile.in

@@ -10,6 +10,8 @@ EXTRAINCL = @FREETYPEINCL@
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = wineps16.drv.spec
+
 FONTMETRICS = \
 	AvantGarde_Book \
 	AvantGarde_BookOblique \

dlls/winmm/Makefile.in

@@ -10,6 +10,8 @@ ALTNAMES  = mmsystem.dll sound.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	driver.c \
 	joystick.c \

dlls/winnls/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = winnls.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	winnls.c
 

dlls/winsock/Makefile.in

@@ -10,6 +10,8 @@ ALTNAMES  = winsock.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	async.c \
 	socket.c

dlls/wintab32/Makefile.in

@@ -9,6 +9,8 @@ ALTNAMES  = wintab.dll
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
+SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
+
 C_SRCS = \
 	context.c \
 	manager.c

miscemu/Makefile.in

@@ -6,8 +6,6 @@ MODULE    = wine
 IMPORTS   = ntdll
 LDIMPORTS = ntdll.dll
 
-SPEC_SRCS = wine.spec
-
 C_SRCS = \
 	main.c
 
@@ -15,13 +13,13 @@ all: $(MODULE)
 
 @MAKE_RULES@
 
-ALL_OBJS = $(SPEC_SRCS:.spec=.spec.o) $(OBJS)
+ALL_OBJS = $(MODULE).spec.o $(OBJS)
 
 $(MODULE): $(ALL_OBJS)
 	$(CC) -o $@ $(ALL_OBJS) -L$(DLLDIR) $(LDIMPORTS:%=-l%) $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LIBS) $(LDFLAGS)
 
-wine.spec.c: $(WINEBUILD)
-	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ --exe wine --exe-mode gui --entry wine_initial_task -L$(DLLDIR) $(IMPORTS:%=-l%)
+$(MODULE).spec.c: $(WINEBUILD)
+	$(LDPATH) $(WINEBUILD) $(DEFS) -o $@ --exe $(MODULE) --exe-mode gui --entry wine_initial_task -L$(DLLDIR) $(IMPORTS:%=-l%)
 
 install:: $(MODULE)
 	$(MKINSTALLDIRS) $(bindir)