Renamed libuuid.a to libwine_uuid.a

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@
 

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
 

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:

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)