Moved bulk of OLE implementation to dlls/ subdirectories.

Makefile.in

@@ -45,6 +45,11 @@ LIBSUBDIRS = \
 	dlls/msnet32 \
 	dlls/msvideo \
 	dlls/ntdll \
+	dlls/ole32 \
+	dlls/oleaut32 \
+	dlls/olecli \
+	dlls/oledlg \
+	dlls/olesvr \
 	dlls/psapi \
 	dlls/rasapi32 \
 	dlls/shell32 \
@@ -137,6 +142,11 @@ LIBOBJS = \
 	dlls/msnet32/msnet32.o \
 	dlls/msvideo/msvideo.o \
 	dlls/ntdll/ntdll.o \
+	dlls/ole32/ole32.o \
+	dlls/oleaut32/oleaut32.o \
+	dlls/olecli/olecli.o \
+	dlls/oledlg/oledlg.o \
+	dlls/olesvr/olesvr.o \
 	dlls/psapi/psapi.o \
 	dlls/rasapi32/rasapi32.o \
 	dlls/shell32/shell32.o \

configure

@@ -5590,6 +5590,11 @@ dlls/msacm32/Makefile
 dlls/msnet32/Makefile
 dlls/msvideo/Makefile
 dlls/ntdll/Makefile
+dlls/ole32/Makefile
+dlls/oleaut32/Makefile
+dlls/olecli/Makefile
+dlls/oledlg/Makefile
+dlls/olesvr/Makefile
 dlls/psapi/Makefile
 dlls/rasapi32/Makefile
 dlls/shell32/Makefile
@@ -5777,6 +5782,11 @@ dlls/msacm32/Makefile
 dlls/msnet32/Makefile
 dlls/msvideo/Makefile
 dlls/ntdll/Makefile
+dlls/ole32/Makefile
+dlls/oleaut32/Makefile
+dlls/olecli/Makefile
+dlls/oledlg/Makefile
+dlls/olesvr/Makefile
 dlls/psapi/Makefile
 dlls/rasapi32/Makefile
 dlls/shell32/Makefile

configure.in

@@ -839,6 +839,11 @@ dlls/msacm32/Makefile
 dlls/msnet32/Makefile
 dlls/msvideo/Makefile
 dlls/ntdll/Makefile
+dlls/ole32/Makefile
+dlls/oleaut32/Makefile
+dlls/olecli/Makefile
+dlls/oledlg/Makefile
+dlls/olesvr/Makefile
 dlls/psapi/Makefile
 dlls/rasapi32/Makefile
 dlls/shell32/Makefile

dlls/Makefile.in

@@ -14,6 +14,11 @@ SUBDIRS = \
 	msnet32 \
 	msvideo \
 	ntdll \
+	ole32 \
+	oleaut32 \
+	olecli \
+	oledlg \
+	olesvr \
 	psapi \
 	shell32 \
 	sound \

dlls/ole32/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+ole32.spec.c
+ole2.spec.c
+storage.spec.c
+compobj.spec.c

dlls/ole32/Makefile.in

@@ -0,0 +1,37 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = ole32
+
+SPEC_SRCS = ole32.spec ole2.spec storage.spec compobj.spec
+
+C_SRCS = \
+	antimoniker.c \
+	bindctx.c \
+	clipboard.c \
+	compobj.c \
+	compositemoniker.c \
+	datacache.c \
+	defaulthandler.c \
+	filemoniker.c \
+	hglobalstream.c \
+	ifs.c \
+	itemmoniker.c \
+	memlockbytes.c \
+	moniker.c \
+	ole2.c \
+	ole2stubs.c \
+	oleobj.c \
+	stg_bigblockfile.c \
+	stg_stream.c \
+	storage.c \
+	storage32.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/oleaut32/.cvsignore

@@ -0,0 +1,4 @@
+Makefile
+oleaut32.spec.c
+ole2disp.spec.c
+typelib.spec.c

dlls/oleaut32/Makefile.in

@@ -0,0 +1,24 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = oleaut32
+
+SPEC_SRCS = oleaut32.spec ole2disp.spec typelib.spec
+
+C_SRCS = \
+	ole2disp.c \
+	oleaut.c \
+	olefont.c \
+	parsedt.c \
+	safearray.c \
+	typelib.c \
+	variant.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/olecli/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+olecli32.spec.c
+olecli.spec.c

dlls/olecli/Makefile.in

@@ -0,0 +1,18 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = olecli
+
+SPEC_SRCS = olecli32.spec olecli.spec
+
+C_SRCS = \
+	olecli_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/oledlg/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+oledlg.spec.c

dlls/oledlg/Makefile.in

@@ -0,0 +1,18 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = oledlg
+
+SPEC_SRCS = oledlg.spec
+
+C_SRCS = \
+	oledlg_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

dlls/olesvr/.cvsignore

@@ -0,0 +1,3 @@
+Makefile
+olesvr32.spec.c
+olesvr.spec.c

dlls/olesvr/Makefile.in

@@ -0,0 +1,18 @@
+DEFS      = @DLLFLAGS@ -D__WINE__
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = olesvr
+
+SPEC_SRCS = olesvr32.spec olesvr.spec
+
+C_SRCS = \
+	olesvr_main.c
+
+all: $(MODULE).o
+
+@MAKE_RULES@
+
+### Dependencies:
+

if1632/.cvsignore

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

if1632/Makefile.in

@@ -7,7 +7,6 @@ MODULE    = if1632
 
 SPEC_SRCS = \
 	comm.spec \
-	compobj.spec \
 	ddeml.spec \
 	dispdib.spec \
 	display.spec \
@@ -16,18 +15,12 @@ SPEC_SRCS = \
 	keyboard.spec \
 	mmsystem.spec \
 	mouse.spec \
-	ole2.spec \
 	ole2conv.spec \
-	ole2disp.spec \
 	ole2nls.spec \
 	ole2prox.spec \
 	ole2thk.spec \
-	olecli.spec \
-	olesvr.spec \
-	storage.spec \
 	system.spec \
 	toolhelp.spec \
-	typelib.spec \
 	user.spec \
 	wineps.spec \
 	winsock.spec \

ole/Makefile.in

@@ -6,38 +6,8 @@ VPATH     = @srcdir@
 MODULE    = ole
 
 C_SRCS = \
-	antimoniker.c \
-	bindctx.c \
-	clipboard.c\
-	compobj.c \
-	compositemoniker.c \
-	datacache.c \
-	defaulthandler.c \
-	filemoniker.c \
 	guid.c \
-	hglobalstream.c \
-	ifs.c \
-	itemmoniker.c \
-	memlockbytes.c \
-	moniker.c \
-	ole2.c \
-	ole2disp.c \
-	ole2nls.c \
-	ole2stubs.c \
-	oleaut32.c \
-	olecli.c \
-	oledlg.c \
-	olefont.c \
-	oleobj.c \
-	olesvr.c \
-	parsedt.c \
-	safearray.c \
-	stg_bigblockfile.c \
-	stg_stream.c \
-	storage.c \
-	storage32.c \
-	typelib.c \
-	variant.c
+	ole2nls.c 
 
 all: $(MODULE).o
 

relay32/.cvsignore

@@ -12,11 +12,6 @@ mciavi.spec.c
 mcicda.spec.c
 mciseq.spec.c
 mciwave.spec.c
-ole32.spec.c
-oleaut32.spec.c
-olecli32.spec.c
-oledlg.spec.c
-olesvr32.spec.c
 user32.spec.c
 winmm.spec.c
 wow32.spec.c

relay32/Makefile.in

@@ -18,11 +18,6 @@ SPEC_SRCS = \
 	mcicda.spec \
 	mciseq.spec \
 	mciwave.spec \
-	ole32.spec \
-	oleaut32.spec \
-	olecli32.spec \
-	oledlg.spec \
-	olesvr32.spec \
 	user32.spec \
 	winmm.spec \
 	wow32.spec \