Moving nsEmbedString to mozilla/string. r=cls.

xpcom/glue/standalone/Makefile.in

@@ -46,32 +46,22 @@ MODULE		= xpcom
 LIBRARY_NAME	= xpcomglue
 
 REQUIRES	= string \
+		  embedstring \
 		  $(NULL)
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../build \
 		$(NULL)
 
-STRING_LCSRCS   = \
-		nsAString.cpp		     \
-		nsDependentSubstring.cpp     \
-		nsASingleFragmentString.cpp  \
-		$(NULL)
-
-STRING_CSRCS    := $(addprefix $(topsrcdir)/string/src/, $(STRING_LCSRCS))
-
 CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS)     \
-		$(STRING_LCSRCS)             \
 		nsXPCOMGlue.cpp              \
-		nsEmbedString.cpp	     \
 		nsGREDirServiceProvider.cpp  \
 		nsDebugGlue.cpp		     \
 		$(NULL)
 
 SDK_HEADERS     = \
 		nsXPCOMGlue.h \
-		nsEmbedString.h \
 		$(NULL)
 
 SDK_BINARY     	= \
@@ -85,11 +75,9 @@ FORCE_STATIC_LIB = 1
 FORCE_USE_PIC	= 1
 
 GARBAGE         += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
-GARBAGE         += $(STRING_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
 
 ifeq ($(OS_ARCH),WINNT)
 GARBAGE		+= $(addprefix $(srcdir)/,$(XPCOM_GLUE_SRC_LCSRCS))
-GARBAGE		+= $(addprefix $(srcdir)/,$(STRING_LCSRCS))
 endif
 
 SRCS_IN_OBJDIR	= 1
@@ -98,7 +86,7 @@ include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+=  -DMOZILLA_VERSION=\"$(MOZILLA_VERSION)\"
 
-export:: $(XPCOM_GLUE_SRC_CSRCS) $(STRING_CSRCS)
+export:: $(XPCOM_GLUE_SRC_CSRCS) 
 	$(INSTALL) $^ .
 
 DEFINES		+= -DXPCOM_GLUE

xpcom/sample/Makefile.in

@@ -64,11 +64,13 @@ EXTRA_COMPONENTS = nsSample.js
 # seperate libraries linked in.
 EXTRA_DSO_LDOPTS = \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)embedstring.$(LIB_SUFFIX) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 LIBS            = \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)embedstring_s.$(LIB_SUFFIX) \
 		$(NSPR_LIBS) \
 		$(NULL)