From c4d1176754f5354403573b7ff7576abf8e3088bb Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 27 Dec 2000 19:06:44 +0000
Subject: [PATCH] Renamed libuuid.a to libwine_uuid.a

---
 Make.rules.in   |  2 +-
 Makefile.in     | 10 +++++-----
 ole/Makefile.in | 10 +++++-----
 tools/winemaker |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 8c8805fa02b..a2f72518a5d 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -67,7 +67,7 @@ DLLDIR    = $(TOPOBJDIR)/dlls
 LIBWINE   = -L$(TOPOBJDIR)/library -lwine
 LIBTSX11  = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11
 LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode
-LIBUUID   = -L$(TOPOBJDIR)/ole -luuid
+LIBUUID   = -L$(TOPOBJDIR)/ole -lwine_uuid
 
 @SET_MAKE@
 
diff --git a/Makefile.in b/Makefile.in
index ae2f25c5bb8..3787e06d107 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,16 +33,16 @@ LIBPROGRAMS = \
 # Libraries (not dlls) to build
 LIBRARIES = \
 	library/libwine.$(LIBEXT) \
-	ole/libuuid.a \
+	ole/libwine_uuid.a \
 	tsx11/libwine_tsx11.$(LIBEXT) \
 	unicode/libwine_unicode.$(LIBEXT)
 
 # Libraries symlinks to create at the top level
 LIBSYMLINKS = \
-	libuuid.a \
 	libwine.$(LIBEXT) \
 	libwine_tsx11.$(LIBEXT) \
-	libwine_unicode.$(LIBEXT)
+	libwine_unicode.$(LIBEXT) \
+	libwine_uuid.a
 
 # Sub-directories to run make depend/clean into
 SUBDIRS = \
@@ -104,8 +104,8 @@ libwine_tsx11.$(LIBEXT): tsx11/libwine_tsx11.$(LIBEXT)
 libwine_unicode.$(LIBEXT): unicode/libwine_unicode.$(LIBEXT)
 	$(RM) $@ && $(LN_S) unicode/libwine_unicode.$(LIBEXT) $@
 
-libuuid.a: ole/libuuid.a
-	$(RM) $@ && $(LN_S) ole/libuuid.a $@
+libwine_uuid.a: ole/libwine_uuid.a
+	$(RM) $@ && $(LN_S) ole/libwine_uuid.a $@
 
 # Dependencies between directories
 
diff --git a/ole/Makefile.in b/ole/Makefile.in
index 6e63d439e25..ce12c5e3520 100644
--- a/ole/Makefile.in
+++ b/ole/Makefile.in
@@ -9,23 +9,23 @@ C_SRCS = \
 	ole2nls.c \
 	uuid.c
 
-all: $(MODULE).o libuuid.a
+all: $(MODULE).o libwine_uuid.a
 
 @MAKE_RULES@
 
 $(MODULE).o: ole2nls.o Makefile.in $(TOPSRCDIR)/Make.rules.in
 	$(LDCOMBINE) ole2nls.o -o $@
 
-libuuid.a: uuid.o
+libwine_uuid.a: uuid.o
 	$(RM) $@
 	$(AR) $@ uuid.o
 	$(RANLIB) $@
 
-install: libuuid.a
+install: libwine_uuid.a
 	[ -d $(libdir) ] || $(MKDIR) $(libdir)
-	$(INSTALL_DATA) libuuid.a $(libdir)/libuuid.a
+	$(INSTALL_DATA) libwine_uuid.a $(libdir)/libwine_uuid.a
 
 uninstall::
-	cd $(libdir) && $(RM) libuuid.a
+	cd $(libdir) && $(RM) libwine_uuid.a
 
 ### Dependencies:
diff --git a/tools/winemaker b/tools/winemaker
index 975a38aa96f..f0144687c10 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -2249,7 +2249,7 @@ then
 fi
 
 CFLAGS="$CFLAGS -fPIC"
-DLL_LINK="\$(WINE_LIBRARY_PATH) \$(LIBRARY_PATH) \$(LIBRARIES:%=-l%) -lwine -lwine_unicode -luuid"
+DLL_LINK="\$(WINE_LIBRARY_PATH) \$(LIBRARY_PATH) \$(LIBRARIES:%=-l%) -lwine -lwine_unicode -lwine_uuid"
 
 AC_SUBST(DLL_LINK)
 AC_SUBST(LDSHARED)