Move mozilla/string into mozilla/xpcom/.

Bug #214700 r=dougt sr=leaf a=mkaply
This commit is contained in:
cls%seawood.org 2003-08-14 23:50:21 +00:00
parent 61232d744d
commit 74a903bcdb
9 changed files with 22 additions and 25 deletions

View File

@ -132,9 +132,8 @@ tier_2_dirs += lib/mac/MoreFiles
endif
tier_2_dirs += \
modules/libreg \
string \
xpcom \
modules/libreg \
xpcom/obsolete \
$(NULL)

View File

@ -545,12 +545,12 @@ widget/src/support/Makefile
"
MAKEFILES_xpcom="
string/Makefile
string/obsolete/Makefile
string/public/Makefile
string/src/Makefile
string/embed/Makefile
string/embed/standalone/Makefile
xpcom/string/Makefile
xpcom/string/obsolete/Makefile
xpcom/string/public/Makefile
xpcom/string/src/Makefile
xpcom/string/embed/Makefile
xpcom/string/embed/standalone/Makefile
xpcom/Makefile
xpcom/base/Makefile
xpcom/build/Makefile
@ -580,8 +580,6 @@ xpcom/reflect/xptinfo/Makefile
xpcom/reflect/xptinfo/public/Makefile
xpcom/reflect/xptinfo/src/Makefile
xpcom/reflect/xptinfo/tests/Makefile
xpcom/obsolete/Makefile
xpcom/obsolete/component/Makefile
xpcom/proxy/Makefile
xpcom/proxy/public/Makefile
xpcom/proxy/src/Makefile
@ -600,6 +598,10 @@ intl/uconv/public/Makefile
netwerk/base/public/Makefile
netwerk/build/Makefile
"
MAKEFILES_xpcom_obsolete="
xpcom/obsolete/Makefile
xpcom/obsolete/component/Makefile
"
MAKEFILES_xpcom_tests="
xpcom/tests/Makefile
@ -1371,6 +1373,7 @@ $MAKEFILES_webshell
$MAKEFILES_widget
$MAKEFILES_xft
$MAKEFILES_xpcom
$MAKEFILES_xpcom_obsolete
$MAKEFILES_xpcom_tests
$MAKEFILES_xpconnect
$MAKEFILES_xpinstall

View File

@ -31,6 +31,7 @@ GRE_MODULE = 1
DIRS = \
typelib \
string \
glue \
base \
ds \

View File

@ -20,7 +20,7 @@
# Johnny Stenback <jst@netscape.com> (original author)
#
DEPTH = ..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@

View File

@ -35,7 +35,7 @@
# ***** END LICENSE BLOCK *****
DEPTH = ../..
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@ -62,7 +62,7 @@ STRING_LCSRCS = \
nsASingleFragmentString.cpp \
$(NULL)
STRING_CSRCS := $(addprefix $(topsrcdir)/string/src/, $(STRING_LCSRCS))
STRING_CSRCS := $(addprefix $(srcdir)/../src/, $(STRING_LCSRCS))
CPPSRCS = \
$(STRING_LCSRCS) \

View File

@ -35,7 +35,7 @@
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@ -60,14 +60,14 @@ STRING_LCSRCS = \
nsASingleFragmentString.cpp \
$(NULL)
STRING_CSRCS := $(addprefix $(topsrcdir)/string/src/, $(STRING_LCSRCS))
STRING_CSRCS := $(addprefix $(srcdir)/../../src/, $(STRING_LCSRCS))
EMBED_STRING_LCSRCS = \
nsEmbedString.cpp \
$(NULL)
EMBED_STRING_CSRCS := $(addprefix $(topsrcdir)/string/embed/, $(EMBED_STRING_LCSRCS))
EMBED_STRING_CSRCS := $(addprefix $(srcdir)/../, $(EMBED_STRING_LCSRCS))
CPPSRCS = \
$(STRING_LCSRCS) \

View File

@ -20,7 +20,7 @@
# Johnny Stenback <jst@netscape.com> (original author)
#
DEPTH = ../..
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@ -47,8 +47,6 @@ EXPORTS = \
nsString2.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
# we don't want the shared lib, but we want to force the creation of a
# static lib.
FORCE_STATIC_LIB = 1

View File

@ -21,7 +21,7 @@
# Scott Collins <scc@mozilla.org>
#
DEPTH = ../..
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@ -63,6 +63,4 @@ EXPORTS = \
nsXPIDLString.h \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
include $(topsrcdir)/config/rules.mk

View File

@ -21,7 +21,7 @@
# Scott Collins <scc@mozilla.org>
#
DEPTH = ../..
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
@ -49,8 +49,6 @@ CPPSRCS = \
nsXPIDLString.cpp \
$(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
# we don't want the shared lib, but we want to force the creation of a
# static lib.
FORCE_STATIC_LIB = 1