Moved libwine_uuid to the new libs/ directory.

Make.rules.in

@@ -73,7 +73,7 @@ DLLDIR       = $(TOPOBJDIR)/dlls
 LIBPORT      = -L$(TOPOBJDIR)/libs/port -lwine_port
 LIBWINE      = -L$(TOPOBJDIR)/library -lwine
 LIBUNICODE   = -L$(TOPOBJDIR)/unicode -lwine_unicode
-LIBUUID      = -L$(TOPOBJDIR)/ole -lwine_uuid
+LIBUUID      = -L$(TOPOBJDIR)/libs/uuid -lwine_uuid
 
 @SET_MAKE@
 

Makefile.in

@@ -34,7 +34,6 @@ SUBDIRS = \
 	library \
 	libs \
 	miscemu \
-	ole \
 	programs \
 	server \
 	tools \
@@ -50,10 +49,7 @@ INSTALLLIBSUBDIRS = \
 	unicode
 
 # Sub-directories to install for install-dev
-INSTALLDEVSUBDIRS = \
+INSTALLDEVSUBDIRS = include tools
-	include \
-	ole \
-	tools
 
 # Sub-directories to install for both install-lib and install-dev
 INSTALLBOTHSUBDIRS = dlls libs
@@ -121,17 +117,16 @@ $(INSTALLBOTHSUBDIRS:%=%/__uninstall__): dummy
 # Dependencies between directories
 
 all: $(SUBDIRS)
-dlls: library libs ole tools unicode
+dlls: library libs tools unicode
 server: library libs tools unicode
-miscemu programs: dlls library libs ole tools unicode
+miscemu programs: dlls library libs tools unicode
 tools: library libs unicode
 
-dlls/__install-lib__ dlls/__install-dev__: library libs ole tools unicode
+dlls/__install-lib__ dlls/__install-dev__: library libs tools unicode
 server/__install__: library libs tools unicode
-miscemu/__install__ programs/__install__: library libs ole tools unicode dlls/__install-lib__
+miscemu/__install__ programs/__install__: library libs tools unicode dlls/__install-lib__
 library/__install__: library
 libs/__install__: libs
-ole/__install__: ole
 tools/__install__: tools
 unicode/__install__: unicode
 

configure.ac

@@ -1369,6 +1369,7 @@ WINE_CONFIG_EXTRA_DIR(memory)
 WINE_CONFIG_EXTRA_DIR(misc)
 WINE_CONFIG_EXTRA_DIR(msdos)
 WINE_CONFIG_EXTRA_DIR(objects)
+WINE_CONFIG_EXTRA_DIR(ole)
 WINE_CONFIG_EXTRA_DIR(programs/regapi/tests)
 WINE_CONFIG_EXTRA_DIR(programs/regedit/tests)
 WINE_CONFIG_EXTRA_DIR(relay32)
@@ -1519,8 +1520,8 @@ include/Makefile
 library/Makefile
 libs/Makefile
 libs/port/Makefile
+libs/uuid/Makefile
 miscemu/Makefile
-ole/Makefile
 programs/Makefile
 programs/avitools/Makefile
 programs/clock/Makefile

dlls/kernel/Makefile.in

@@ -42,7 +42,7 @@ MC_SRCS = \
 	messages/winerr_enu.mc
 
 SUBDIRS      = tests
-EXTRASUBDIRS = messages nls
+EXTRASUBDIRS = messages nls $(TOPOBJDIR)/ole
 
 @MAKE_DLL_RULES@
 

libs/Makefile.in

@@ -5,13 +5,14 @@ VPATH     = @srcdir@
 MODULE    = none
 
 SUBDIRS = \
-	port
+	port \
+	uuid
 
 # Sub-directories to install for install-lib
 INSTALLLIBSUBDIRS =
 
 # Sub-directories to install for install-dev
-INSTALLDEVSUBDIRS =
+INSTALLDEVSUBDIRS = uuid
 
 INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS)
 

libs/uuid/Makefile.in

@@ -1,20 +1,20 @@
 DEFS      = @DLLFLAGS@ -D__WINESRC__
 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = none
+MODULE    = libwine_uuid.a
 
 C_SRCS = \
 	dx8guid.c \
 	dxguid.c \
 	uuid.c
 
-all: libwine_uuid.a
+all: $(MODULE)
 
 @MAKE_RULES@
 
-libwine_uuid.a: $(OBJS)
+$(MODULE): $(OBJS)
 	$(RM) $@
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@