Adapted to glue code generation changes.

Make.rules.in

@@ -82,7 +82,7 @@ LINTS = $(C_SRCS:.c=.ln)
 # Implicit rules
 
 .SUFFIXES:
-.SUFFIXES: .rc .res .spec .spec.c .spec.o .glue.s $(SUFFIXES)
+.SUFFIXES: .rc .res .spec .spec.c .spec.o .glue.c $(SUFFIXES)
 
 .c.o:
 	$(CC) -c $(ALLCFLAGS) -o $*.o $<
@@ -114,7 +114,7 @@ LINTS = $(C_SRCS:.c=.ln)
 .spec.spec.c:
 	$(BUILD) @BUILDFLAGS@ -o $@ -spec $<
 
-.c.glue.s:
+.c.glue.c:
 	$(BUILD) @BUILDFLAGS@ -o $@ -glue $<
 
 .c.ln:
@@ -176,13 +176,13 @@ lint:: $(MODULE).ln
 
 $(SPEC_SRCS:.spec=.spec.c): $(BUILD) $(TOPSRCDIR)/include/builtin16.h $(TOPSRCDIR)/include/builtin32.h
 
-$(GLUE:.c=.glue.s): $(BUILD)
+$(GLUE:.c=.glue.c): $(BUILD) $(TOPSRCDIR)/include/builtin16.h $(TOPSRCDIR)/include/builtin32.h
 
 depend:: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS)
 	$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS)
 
 clean::
-	$(RM) *.o *.ln \#*\# *~ *% .#* *.bak *.orig *.rej *.flc y.tab.c y.tab.h lex.yy.c core $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(SPEC_SRCS:.spec=.spec.c) $(GLUE:.c=.glue.s) $(PROGRAMS)
+	$(RM) *.o *.ln \#*\# *~ *% .#* *.bak *.orig *.rej *.flc y.tab.c y.tab.h lex.yy.c core $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(SPEC_SRCS:.spec=.spec.c) $(GLUE:.c=.glue.c) $(PROGRAMS)
 
 dummy:
 

dlls/avifil32/.cvsignore

@@ -1,4 +1,3 @@
 Makefile
 avifil32.spec.c
 avifile.spec.c
-avifile.spec.glue.s

dlls/avifil32/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = avifil32
 
 SPEC_SRCS = avifil32.spec avifile.spec
-GLUE      = avifile.spec.c
 
 C_SRCS = \
 	avifile.c

dlls/commdlg/.cvsignore

@@ -1,5 +1,4 @@
 Makefile
 comdlg32.spec.c
 commdlg.spec.c
-commdlg.spec.glue.s
 rsrc.s

dlls/commdlg/Makefile.in

@@ -7,7 +7,6 @@ MODULE    = commdlg
 WRCEXTRA  = -s -pcomdlg32
 
 SPEC_SRCS = commdlg.spec comdlg32.spec
-GLUE      = commdlg.spec.c
 
 C_SRCS = \
 	cdlg32.c \

dlls/lzexpand/.cvsignore

@@ -1,4 +1,3 @@
 Makefile
 lz32.spec.c
 lzexpand.spec.c
-lzexpand.spec.glue.s

dlls/lzexpand/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = lzexpand
 
 SPEC_SRCS = lz32.spec lzexpand.spec
-GLUE      = lzexpand.spec.c
 
 C_SRCS = \
 	lzexpand_main.c

dlls/msacm/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 msacm.spec.c
-msacm.spec.glue.s

dlls/msacm/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = msacm
 
 SPEC_SRCS = msacm.spec
-GLUE      = msacm.spec.c
 
 C_SRCS = \
 	msacm_main.c

dlls/msvideo/.cvsignore

@@ -1,4 +1,3 @@
 Makefile
 msvfw32.spec.c
 msvideo.spec.c
-msvideo.spec.glue.s

dlls/msvideo/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = msvideo
 
 SPEC_SRCS = msvfw32.spec msvideo.spec
-GLUE      = msvideo.spec.c
 
 C_SRCS = \
 	msvideo_main.c

dlls/rasapi32/.cvsignore

@@ -1,4 +1,3 @@
 Makefile
 rasapi32.spec.c
 rasapi16.spec.c
-rasapi16.spec.glue.s

dlls/rasapi32/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = rasapi32
 
 SPEC_SRCS = rasapi32.spec rasapi16.spec
-GLUE      = rasapi16.spec.c
 
 C_SRCS = rasapi.c 
 

dlls/shell32/.cvsignore

@@ -1,5 +1,4 @@
 Makefile
 shell32.spec.c
 shell.spec.c
-shell.spec.glue.s
 shres.s

dlls/shell32/Makefile.in

@@ -7,7 +7,6 @@ MODULE    = shell32
 WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = shell32.spec shell.spec
-GLUE      = shell.spec.c
 
 C_SRCS = \
 	brsfolder.c \

dlls/sound/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 sound.spec.c
-sound.spec.glue.s

dlls/sound/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = sound
 
 SPEC_SRCS = sound.spec
-GLUE      = sound.spec.c
 
 C_SRCS = \
 	sound_main.c

dlls/stress/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 stress.spec.c
-stress.spec.glue.s

dlls/stress/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = stress
 
 SPEC_SRCS = stress.spec
-GLUE      = stress.spec.c
 
 C_SRCS = \
 	stress_main.c

dlls/ver/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 ver.spec.c
-ver.spec.glue.s

dlls/ver/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = ver
 
 SPEC_SRCS = ver.spec
-GLUE      = ver.spec.c
 
 C_SRCS = \
 	ver16.c

dlls/win32s/.cvsignore

@@ -1,6 +1,4 @@
 Makefile
 w32skrnl.spec.c
 w32sys.spec.c
-w32sys.spec.glue.s
 win32s16.spec.c
-win32s16.spec.glue.s

dlls/win32s/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = win32s
 
 SPEC_SRCS = w32sys.spec win32s16.spec w32skrnl.spec
-GLUE      = w32sys.spec.c win32s16.spec.c
 
 C_SRCS = \
 	w32skrnl.c \

dlls/win87em/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 win87em.spec.c
-win87em.spec.glue.s

dlls/win87em/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = win87em
 
 SPEC_SRCS = win87em.spec
-GLUE      = win87em.spec.c
 
 C_SRCS = \
 	emulate.c

dlls/winaspi/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 winaspi.spec.c
-winaspi.spec.glue.s

dlls/winaspi/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = winaspi
 
 SPEC_SRCS = winaspi.spec
-GLUE      = winaspi.spec.c
 
 C_SRCS = \
 	winaspi16.c

dlls/windebug/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 windebug.spec.c
-windebug.spec.glue.s

dlls/windebug/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = windebug
 
 SPEC_SRCS = windebug.spec
-GLUE      = windebug.spec.c
 
 C_SRCS = \
 	windebug_main.c

dlls/wing/.cvsignore

@@ -1,3 +1,2 @@
 Makefile
 wing.spec.c
-wing.spec.glue.s

dlls/wing/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = wing
 
 SPEC_SRCS = wing.spec
-GLUE      = wing.spec.c
 
 C_SRCS = \
 	wing_main.c

if1632/.cvsignore

@@ -1,59 +1,31 @@
 Makefile
 call16.s
 callfrom16.spec.c
-callfrom16.spec.glue.s
 callto16.spec.c
-callto16.spec.glue.s
 comm.spec.c
-comm.spec.glue.s
 compobj.spec.c
-compobj.spec.glue.s
 ddeml.spec.c
-ddeml.spec.glue.s
 dispdib.spec.c
-dispdib.spec.glue.s
 display.spec.c
-display.spec.glue.s
 gdi.spec.c
-gdi.spec.glue.s
 kernel.spec.c
-kernel.spec.glue.s
 keyboard.spec.c
-keyboard.spec.glue.s
 mmsystem.spec.c
-mmsystem.spec.glue.s
 mouse.spec.c
-mouse.spec.glue.s
 ole2.spec.c
-ole2.spec.glue.s
 ole2conv.spec.c
-ole2conv.spec.glue.s
 ole2disp.spec.c
-ole2disp.spec.glue.s
 ole2nls.spec.c
-ole2nls.spec.glue.s
 ole2prox.spec.c
-ole2prox.spec.glue.s
 ole2thk.spec.c
-ole2thk.spec.glue.s
 olecli.spec.c
-olecli.spec.glue.s
 olesvr.spec.c
-olesvr.spec.glue.s
 storage.spec.c
-storage.spec.glue.s
 system.spec.c
-system.spec.glue.s
+thunk.glue.c
-thunk.glue.s
 toolhelp.spec.c
-toolhelp.spec.glue.s
 typelib.spec.c
-typelib.spec.glue.s
 user.spec.c
-user.spec.glue.s
 wineps.spec.c
-wineps.spec.glue.s
 winsock.spec.c
-winsock.spec.glue.s
 wprocs.spec.c
-wprocs.spec.glue.s

if1632/Makefile.in

@@ -43,8 +43,7 @@ C_SRCS = \
 GEN_ASM_SRCS = \
 	call16.s
 
-GLUE = 	$(SPEC_SRCS:.spec=.spec.c) \
+GLUE = thunk.c
-	thunk.c
 
 all: $(MODULE).o