Moved libwine_unicode to the libs/ directory.

Make.rules.in

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

Makefile.in

@@ -36,8 +36,7 @@ SUBDIRS = \
 	miscemu \
 	programs \
 	server \
-	tools \
-	unicode
+	tools
 
 # Sub-directories to install for install-lib
 INSTALLLIBSUBDIRS = \
@@ -45,8 +44,7 @@ INSTALLLIBSUBDIRS = \
 	library \
 	miscemu \
 	programs \
-	server \
-	unicode
+	server
 
 # Sub-directories to install for install-dev
 INSTALLDEVSUBDIRS = include tools
@@ -117,18 +115,17 @@ $(INSTALLBOTHSUBDIRS:%=%/__uninstall__): dummy
 # Dependencies between directories
 
 all: $(SUBDIRS)
-dlls: library libs tools unicode
-server: library libs tools unicode
-miscemu programs: dlls library libs tools unicode
-tools: library libs unicode
-
-dlls/__install-lib__ dlls/__install-dev__: library libs tools unicode
-server/__install__: library libs tools unicode
-miscemu/__install__ programs/__install__: library libs tools unicode dlls/__install-lib__
+dlls: library libs tools
+server: library libs tools
+miscemu programs: dlls library libs tools
+tools: library libs
+
+dlls/__install-lib__ dlls/__install-dev__: library libs tools
+server/__install__: library libs tools
+miscemu/__install__ programs/__install__: library libs tools dlls/__install-lib__
 library/__install__: library
 libs/__install__: libs
 tools/__install__: tools
-unicode/__install__: unicode
 
 # Test rules
 

configure.ac

@@ -825,9 +825,9 @@ fi
 
 case $build_os in
   cygwin*|mingw32*)
-    AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$PATH\"") ;;
+    AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$PATH\"") ;;
   *)
-    AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$LD_LIBRARY_PATH\"") ;;
+    AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/unicode:\$\$LD_LIBRARY_PATH\"") ;;
 esac
 
 dnl Mingw needs explicit msvcrt for linking libwine
@@ -1516,6 +1516,7 @@ include/Makefile
 library/Makefile
 libs/Makefile
 libs/port/Makefile
+libs/unicode/Makefile
 libs/uuid/Makefile
 miscemu/Makefile
 programs/Makefile
@@ -1553,8 +1554,7 @@ tools/winebuild/Makefile
 tools/winedump/Makefile
 tools/wmc/Makefile
 tools/wpp/Makefile
-tools/wrc/Makefile
-unicode/Makefile])
+tools/wrc/Makefile])
 
 AC_OUTPUT
 

dlls/Makedll.rules.in

@@ -49,7 +49,7 @@ $(SPEC_DEF): $(WINEBUILD)
 
 # Rules for checking that no imports are missing
 
-CHECKLINK_RPATH = dlls library unicode
+CHECKLINK_RPATH = dlls library libs/unicode
 
 .PHONY: checklink16 $(WIN16_FILES:%=__checklink16__%)
 

libs/Makefile.in

@@ -6,10 +6,11 @@ MODULE    = none
 
 SUBDIRS = \
 	port \
+	unicode \
 	uuid
 
 # Sub-directories to install for install-lib
-INSTALLLIBSUBDIRS =
+INSTALLLIBSUBDIRS = unicode
 
 # Sub-directories to install for install-dev
 INSTALLDEVSUBDIRS = uuid

libs/unicode/.cvsignore

+Makefile
+libwine_unicode.so.1

unicode/Makefile.in → libs/unicode/Makefile.in

 DEFS      = @DLLFLAGS@ -D__WINESRC__
 TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ..
+TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 LIBEXT    = @LIBEXT@
 MODULE    = none
-SOVERSION = 1.0
-SONAME    = libwine_unicode.so
+SOVERSION = 1
+SONAME    = libwine_unicode.so.$(SOVERSION)
 
 CODEPAGES = \
 	037 \
@@ -96,7 +96,6 @@ libwine_unicode.a: $(OBJS)
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@
 
-# --export-all doesn't work correctly because of dllwrap's bug
 libwine_unicode.dll: $(OBJS) wine_unicode.def
 	$(DLLWRAP) --def $(SRCDIR)/wine_unicode.def --implib libwine_unicode.a -o libwine_unicode.dll $(OBJS)
 
@@ -121,6 +120,6 @@ uninstall::
 	$(RM) $(libdir)/libwine_unicode.a $(libdir)/libwine_unicode.dll $(libdir)/libwine_unicode.so $(libdir)/libwine_unicode.so.$(SOVERSION)
 
 clean::
-	$(RM) libwine_unicode.so.$(SOVERSION)
+	$(RM) libwine_unicode.so.$(SOVERSION) libwine_unicode.dll
 
 ### Dependencies:

tools/winewrapper

@@ -64,9 +64,9 @@ topdir=`cd "$topdir" && pwd`
 
 if [ -n "$LD_LIBRARY_PATH" ]
 then
-  LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/unicode:$LD_LIBRARY_PATH"
+  LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/libs/unicode:$LD_LIBRARY_PATH"
 else
-  LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/unicode"
+  LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/libs/unicode"
 fi
 WINEDLLPATH="$topdir/dlls:$topdir/programs"
 WINESERVER="$topdir/server/wineserver"

unicode/.cvsignore

-Makefile
-libwine_unicode.dll
-libwine_unicode.so.1.0