Moved various DLLs to dlls/

Makefile.in

@@ -34,18 +34,29 @@ LIBSUBDIRS = \
 	dlls/avifil32 \
 	dlls/comctl32 \
 	dlls/commdlg \
+	dlls/crtdll \
+	dlls/dciman32 \
 	dlls/imagehlp \
+	dlls/imm32 \
+	dlls/lzexpand \
 	dlls/msacm \
 	dlls/msacm32 \
+	dlls/msnet32 \
+	dlls/msvideo \
 	dlls/ntdll \
 	dlls/psapi \
 	dlls/rasapi32 \
 	dlls/shell32 \
+	dlls/sound \
+	dlls/stress \
 	dlls/tapi32 \
 	dlls/ver \
 	dlls/version \
+	dlls/win32s \
 	dlls/win87em \
 	dlls/winaspi \
+	dlls/windebug \
+	dlls/wing \
 	dlls/winspool \
 	dlls/wnaspi32 \
 	files \
@@ -114,18 +125,29 @@ LIBOBJS = \
 	dlls/avifil32/avifil32.o \
 	dlls/comctl32/comctl32.o \
 	dlls/commdlg/commdlg.o \
+	dlls/crtdll/crtdll.o \
+	dlls/dciman32/dciman32.o \
 	dlls/imagehlp/imagehlp.o \
+	dlls/imm32/imm32.o \
+	dlls/lzexpand/lzexpand.o \
 	dlls/msacm/msacm.o \
 	dlls/msacm32/msacm32.o \
+	dlls/msnet32/msnet32.o \
+	dlls/msvideo/msvideo.o \
 	dlls/ntdll/ntdll.o \
 	dlls/psapi/psapi.o \
 	dlls/rasapi32/rasapi32.o \
 	dlls/shell32/shell32.o \
+	dlls/sound/sound.o \
+	dlls/stress/stress.o \
 	dlls/tapi32/tapi32.o \
 	dlls/ver/ver.o \
 	dlls/version/version.o \
+	dlls/win32s/win32s.o \
 	dlls/win87em/win87em.o \
 	dlls/winaspi/winaspi.o \
+	dlls/windebug/windebug.o \
+	dlls/wing/wing.o \
 	dlls/winspool/winspool.o \
 	dlls/wnaspi32/wnaspi32.o \
 	files/files.o \

configure

@@ -5424,18 +5424,29 @@ dlls/advapi32/Makefile
 dlls/avifil32/Makefile
 dlls/comctl32/Makefile
 dlls/commdlg/Makefile
+dlls/crtdll/Makefile
+dlls/dciman32/Makefile
 dlls/imagehlp/Makefile
+dlls/imm32/Makefile
+dlls/lzexpand/Makefile
 dlls/msacm/Makefile
 dlls/msacm32/Makefile
+dlls/msnet32/Makefile
+dlls/msvideo/Makefile
 dlls/ntdll/Makefile
 dlls/psapi/Makefile
 dlls/rasapi32/Makefile
 dlls/shell32/Makefile
+dlls/sound/Makefile
+dlls/stress/Makefile
 dlls/tapi32/Makefile
 dlls/ver/Makefile
 dlls/version/Makefile
+dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
+dlls/windebug/Makefile
+dlls/wing/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile
@@ -5599,18 +5610,29 @@ dlls/advapi32/Makefile
 dlls/avifil32/Makefile
 dlls/comctl32/Makefile
 dlls/commdlg/Makefile
+dlls/crtdll/Makefile
+dlls/dciman32/Makefile
 dlls/imagehlp/Makefile
+dlls/imm32/Makefile
+dlls/lzexpand/Makefile
 dlls/msacm/Makefile
 dlls/msacm32/Makefile
+dlls/msnet32/Makefile
+dlls/msvideo/Makefile
 dlls/ntdll/Makefile
 dlls/psapi/Makefile
 dlls/rasapi32/Makefile
 dlls/shell32/Makefile
+dlls/sound/Makefile
+dlls/stress/Makefile
 dlls/tapi32/Makefile
 dlls/ver/Makefile
 dlls/version/Makefile
+dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
+dlls/windebug/Makefile
+dlls/wing/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile

configure.in

@@ -775,18 +775,29 @@ dlls/advapi32/Makefile
 dlls/avifil32/Makefile
 dlls/comctl32/Makefile
 dlls/commdlg/Makefile
+dlls/crtdll/Makefile
+dlls/dciman32/Makefile
 dlls/imagehlp/Makefile
+dlls/imm32/Makefile
+dlls/lzexpand/Makefile
 dlls/msacm/Makefile
 dlls/msacm32/Makefile
+dlls/msnet32/Makefile
+dlls/msvideo/Makefile
 dlls/ntdll/Makefile
 dlls/psapi/Makefile
 dlls/rasapi32/Makefile
 dlls/shell32/Makefile
+dlls/sound/Makefile
+dlls/stress/Makefile
 dlls/tapi32/Makefile
 dlls/ver/Makefile
 dlls/version/Makefile
+dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
+dlls/windebug/Makefile
+dlls/wing/Makefile
 dlls/winspool/Makefile
 dlls/wnaspi32/Makefile
 documentation/Makefile

dlls/Makefile.in

@@ -3,17 +3,29 @@ SUBDIRS = \
 	avifil32 \
 	comctl32 \
 	commdlg \
+	crtdll \
+	dciman32 \
 	imagehlp \
+	imm32 \
+	lzexpand \
 	msacm \
 	msacm32 \
+	msnet32 \
+	msvideo \
 	ntdll \
 	psapi \
 	shell32 \
+	sound \
+	stress \
 	tapi32 \
 	ver \
 	version \
+	win32s \
 	win87em \
 	winaspi \
+	windebug \
+	wing \
+	winspool \
 	wnaspi32
 
 all: $(SUBDIRS)

dlls/avifil32/.cvsignore

 Makefile
 avifil32.spec.c
+avifile.spec.c
+avifile.spec.glue.s

dlls/avifil32/Makefile.in

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

dlls/crtdll/.cvsignore

+Makefile
+crtdll.spec.c

dlls/crtdll/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = crtdll
+
+SPEC_SRCS = crtdll.spec
+
+C_SRCS = \
+	crtdll_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:

dlls/dciman32/.cvsignore

+Makefile
+dciman32.spec.c

dlls/dciman32/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = dciman32
+
+SPEC_SRCS = dciman32.spec
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:

dlls/imm32/.cvsignore

+Makefile
+imm32.spec.c

dlls/imm32/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = imm32
+
+SPEC_SRCS = imm32.spec
+
+C_SRCS = \
+	imm.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:

dlls/lzexpand/.cvsignore

+Makefile
+lz32.spec.c
+lzexpand.spec.c
+lzexpand.spec.glue.s

dlls/lzexpand/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = lzexpand
+
+SPEC_SRCS = lz32.spec lzexpand.spec
+GLUE      = lzexpand.spec.c
+
+C_SRCS = \
+	lzexpand_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/msnet32/.cvsignore

+Makefile
+msnet32.spec.c

dlls/msnet32/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = msnet32
+
+SPEC_SRCS = msnet32.spec
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:

dlls/msvideo/.cvsignore

+Makefile
+msvfw32.spec.c
+msvideo.spec.c
+msvideo.spec.glue.s

dlls/msvideo/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = msvideo
+
+SPEC_SRCS = msvfw32.spec msvideo.spec
+GLUE      = msvideo.spec.c
+
+C_SRCS = \
+	msvideo_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/rasapi32/.cvsignore

 Makefile
 rasapi32.spec.c
+rasapi16.spec.c
+rasapi16.spec.glue.s

dlls/rasapi32/Makefile.in

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

dlls/shell32/.cvsignore

 Makefile
 shell32.spec.c
+shell.spec.c
+shell.spec.glue.s
 shres.s

dlls/shell32/Makefile.in

@@ -6,7 +6,8 @@ VPATH     = @srcdir@
 MODULE    = shell32
 WRCEXTRA  = -s -p$(MODULE)
 
-SPEC_SRCS = shell32.spec
+SPEC_SRCS = shell32.spec shell.spec
+GLUE      = shell.spec.c
 
 C_SRCS = \
 	brsfolder.c \
@@ -20,6 +21,7 @@ C_SRCS = \
 	pidl.c \
 	regstream.c \
 	shell32_main.c \
+	shell.c \
 	shellguid.c \
 	shelllink.c \
 	shlmenu.c \

dlls/sound/.cvsignore

+Makefile
+sound.spec.c
+sound.spec.glue.s

dlls/sound/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = sound
+
+SPEC_SRCS = sound.spec
+GLUE      = sound.spec.c
+
+C_SRCS = \
+	sound_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/stress/.cvsignore

+Makefile
+wing.spec.c
+wing.spec.glue.s

dlls/stress/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = stress
+
+SPEC_SRCS = stress.spec
+GLUE      = stress.spec.c
+
+C_SRCS = \
+	stress_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/win32s/.cvsignore

+Makefile
+w32skrnl.spec.c
+w32sys.spec.c
+w32sys.spec.glue.s
+win32s16.spec.c
+win32s16.spec.glue.s

dlls/win32s/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = win32s
+
+SPEC_SRCS = w32sys.spec win32s16.spec w32skrnl.spec
+GLUE      = w32sys.spec.c win32s16.spec.c
+
+C_SRCS = \
+	w32skrnl.c \
+	w32sys.c \
+	win32s16.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/windebug/.cvsignore

+Makefile
+windebug.spec.c
+windebug.spec.glue.s

dlls/windebug/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = windebug
+
+SPEC_SRCS = windebug.spec
+GLUE      = windebug.spec.c
+
+C_SRCS = \
+	windebug_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/wing/.cvsignore

+Makefile
+wing.spec.c
+wing.spec.glue.s

dlls/wing/Makefile.in

+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = wing
+
+SPEC_SRCS = wing.spec
+GLUE      = wing.spec.c
+
+C_SRCS = \
+	wing_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

graphics/Makefile.in

@@ -24,8 +24,7 @@ C_SRCS = \
 	mapping.c \
 	painting.c \
 	path.c \
-	vga.c \
-	wing.c
+	vga.c
 
 all: $(MODULE).o
 

if1632/.cvsignore

 Makefile
-avifile.spec.c
-avifile.spec.glue.s
 call16.s
 callfrom16.spec.c
 callfrom16.spec.glue.s
@@ -22,14 +20,10 @@ kernel.spec.c
 kernel.spec.glue.s
 keyboard.spec.c
 keyboard.spec.glue.s
-lzexpand.spec.c
-lzexpand.spec.glue.s
 mmsystem.spec.c
 mmsystem.spec.glue.s
 mouse.spec.c
 mouse.spec.glue.s
-msvideo.spec.c
-msvideo.spec.glue.s
 ole2.spec.c
 ole2.spec.glue.s
 ole2conv.spec.c
@@ -46,16 +40,8 @@ olecli.spec.c
 olecli.spec.glue.s
 olesvr.spec.c
 olesvr.spec.glue.s
-rasapi16.spec.c
-rasapi16.spec.glue.s
-shell.spec.c
-shell.spec.glue.s
-sound.spec.c
-sound.spec.glue.s
 storage.spec.c
 storage.spec.glue.s
-stress.spec.c
-stress.spec.glue.s
 system.spec.c
 system.spec.glue.s
 thunk.glue.s
@@ -65,16 +51,8 @@ typelib.spec.c
 typelib.spec.glue.s
 user.spec.c
 user.spec.glue.s
-w32sys.spec.c
-w32sys.spec.glue.s
-win32s16.spec.c
-win32s16.spec.glue.s
-windebug.spec.c
-windebug.spec.glue.s
 wineps.spec.c
 wineps.spec.glue.s
-wing.spec.c
-wing.spec.glue.s
 winsock.spec.c
 winsock.spec.glue.s
 wprocs.spec.c

if1632/Makefile.in

@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = if1632
 
 SPEC_SRCS = \
-	avifile.spec \
 	comm.spec \
 	compobj.spec \
 	ddeml.spec \
@@ -15,10 +14,8 @@ SPEC_SRCS = \
 	gdi.spec \
 	kernel.spec \
 	keyboard.spec \
-	lzexpand.spec \
 	mmsystem.spec \
 	mouse.spec \
-	msvideo.spec \
 	ole2.spec \
 	ole2conv.spec \
 	ole2disp.spec \
@@ -27,20 +24,12 @@ SPEC_SRCS = \
 	ole2thk.spec \
 	olecli.spec \
 	olesvr.spec \
-	rasapi16.spec \
-	shell.spec \
-	sound.spec \
 	storage.spec \
-	stress.spec \
 	system.spec \
 	toolhelp.spec \
 	typelib.spec \
 	user.spec \
-	w32sys.spec \
-	win32s16.spec \
-	windebug.spec \
 	wineps.spec \
-	wing.spec \
 	winsock.spec \
 	wprocs.spec
 

misc/Makefile.in

@@ -9,32 +9,22 @@ MODULE    = misc
 C_SRCS = \
 	cdrom.c \
 	comm.c \
-	crtdll.c \
 	cpu.c \
 	ddeml.c \
 	debugstr.c \
 	error.c \
-	imm.c \
 	lstr.c \
-	lzexpand.c \
 	main.c \
 	network.c \
 	port.c \
 	printdrv.c \
 	registry.c \
-	shell.c \
-	sound.c \
 	spy.c \
-	stress.c \
 	system.c \
 	toolhelp.c \
 	tweak.c \
 	version.c \
 	w32scomb.c \
-	w32skrnl.c \
-	w32sys.c \
-	win32s16.c \
-	windebug.c \
 	winsock.c \
 	winsock_async.c \
 	wsprintf.c \

multimedia/Makefile.in

@@ -23,7 +23,6 @@ C_SRCS = \
 	mmaux.c \
 	mmio.c \
 	mmsystem.c \
-	msvideo.c \
 	time.c
 
 RC_SRCS= \

relay32/.cvsignore

 Makefile
 call32.s
-crtdll.spec.c
-dciman32.spec.c
 ddraw.spec.c
 dinput.spec.c
 dplay.spec.c
 dplayx.spec.c
 dsound.spec.c
 gdi32.spec.c
-imm32.spec.c
 kernel32.spec.c
-lz32.spec.c
 mcianim.spec.c
 mciavi.spec.c
 mcicda.spec.c
 mciseq.spec.c
 mciwave.spec.c
 mpr.spec.c
-msnet32.spec.c
-msvfw32.spec.c
 ole32.spec.c
 oleaut32.spec.c
 olecli32.spec.c
 oledlg.spec.c
 olesvr32.spec.c
 user32.spec.c
-w32skrnl.spec.c
 winmm.spec.c
 wow32.spec.c
 wsock32.spec.c

relay32/Makefile.in

@@ -6,32 +6,25 @@ VPATH     = @srcdir@
 MODULE    = relay32
 
 SPEC_SRCS = \
-	crtdll.spec \
-	dciman32.spec \
 	ddraw.spec \
 	dinput.spec \
 	dplay.spec \
 	dplayx.spec \
 	dsound.spec \
 	gdi32.spec \
-	imm32.spec \
 	kernel32.spec \
-	lz32.spec \
 	mpr.spec \
 	mcianim.spec \
 	mciavi.spec \
 	mcicda.spec \
 	mciseq.spec \
 	mciwave.spec \
-	msnet32.spec \
-	msvfw32.spec \
 	ole32.spec \
 	oleaut32.spec \
 	olecli32.spec \
 	oledlg.spec \
 	olesvr32.spec \
 	user32.spec \
-	w32skrnl.spec \
 	winmm.spec \
 	wow32.spec \
 	wsock32.spec