Removing last vestiges of raptor from unix build. Since some libs were renamed, a 'make distclean' is recommeneded to remove the old copies of those libs. Bug #8228 r=bryner

2000-07-02 18:44:42 +00:00 · 2000-07-02 18:44:42 +00:00 · 33938e6100
--- a/config/rules.mk
+++ b/config/rules.mk
@ -541,7 +541,8 @@ distclean:: $(SUBMAKEFILES)
 	rm -rf $(ALL_TRASH) \
 	$(wildcard *.map) \
 	Makefile .HSancillary $(DIST_GARBAGE) \
-	$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho)
+	$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) \
+	$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX))

 alltags:
 	rm -f TAGS
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorevents_s
+LIBRARY_NAME	= gkevents_s


 CPPSRCS		= \
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= nglhtmlcon_s
+LIBRARY_NAME	= gkhtmlcon_s


 CPPSRCS		= \
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxbl_s
+LIBRARY_NAME	= gkxbl_s

 CPPSRCS		= \
    nsXBLBinding.cpp \
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxmlcontent_s
+LIBRARY_NAME	= gkxmlcon_s


 CPPSRCS		= \
@ -54,6 +54,5 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../html/document/src \
 		-I$(srcdir)/../../../html/style/src \
 		-I$(srcdir)/../../../base/src \
-		-I$(DIST)/public/raptor \
 		$(NULL)

--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxmldoc_s
+LIBRARY_NAME	= gkxmldoc_s


 CPPSRCS		= \
@ -56,6 +56,5 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../html/style/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../xul/content/src \
-		-I$(DIST)/public/raptor \
 		$(NULL)

--- a/content/xsl/document/src/Makefile.in
+++ b/content/xsl/document/src/Makefile.in
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk

 include $(topsrcdir)/config/config.mk

-LIBRARY_NAME = raptorxsldoc_s
+LIBRARY_NAME = gkxsldoc_s

 DEFINES += -D_IMPL_NS_HTML

--- a/dom/public/idl/base/Makefile.in
+++ b/dom/public/idl/base/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 GLOBALIDLSRCS	= \
 		Window.idl \
--- a/dom/public/idl/coreDom/Makefile.in
+++ b/dom/public/idl/coreDom/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 IDLSRCS		= \
 		Attr.idl \
--- a/dom/public/idl/css/Makefile.in
+++ b/dom/public/idl/css/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 IDLSRCS		= \
 		CSS2Properties.idl \
--- a/dom/public/idl/events/Makefile.in
+++ b/dom/public/idl/events/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 IDLSRCS		= \
 		Event.idl \
--- a/dom/public/idl/html/Makefile.in
+++ b/dom/public/idl/html/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 IDLSRCS		= \
 		HTMLIFrameElement.idl \
--- a/dom/public/idl/range/Makefile.in
+++ b/dom/public/idl/range/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 IDLSRCS		= \
 		Range.idl \
--- a/extensions/xmlterm/geckoterm/Makefile.in
+++ b/extensions/xmlterm/geckoterm/Makefile.in
@ -69,7 +69,7 @@ CPPSRCS = nsSetupRegistry.cpp  \
 GTK_GLUE		= -lgtksuperwin

 XP_DIST_LIBS		= \
-			-lraptorgfx \
+			-lgkgfx \
 			$(MOZ_JS_LIBS) \
 			$(XPCOM_LIBS) \
 			$(JSJ_LIB) \
--- a/gfx/idl/Makefile.in
+++ b/gfx/idl/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 XPIDL_MODULE	= gfx

 XPIDLSRCS	= \
--- a/gfx/public/Makefile.in
+++ b/gfx/public/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 EXPORTS		= \
 		nsColor.h \
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -26,8 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
-LIBRARY_NAME	= raptorgfx
+MODULE		= layout
+LIBRARY_NAME	= gkgfx
 SHORT_LIBNAME	= nggfx


--- a/gfx/src/beos/Makefile.in
+++ b/gfx/src/beos/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfx_beos


@ -49,7 +49,7 @@ CXXFLAGS	+= $(TK_CFLAGS)
 INCLUDES	+= $(TK_CFLAGS)

 EXTRA_DSO_LDOPTS += \
-	-lraptorgfx \
+	-lgkgfx \
 	$(XPCOM_LIBS) \
 	$(TK_LIBS) \
 	$(NSPR_LIBS) 
--- a/gfx/src/gtk/Makefile.in
+++ b/gfx/src/gtk/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfx_gtk
 IS_COMPONENT	= 1

@ -63,7 +63,7 @@ CFLAGS		+= $(TK_CFLAGS)
 endif

 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
-		-lraptorgfx \
+		-lgkgfx \
 		$(NULL)

 DEFINES		+= -D_IMPL_NS_GFXNONXP
--- a/gfx/src/mac/Makefile.in
+++ b/gfx/src/mac/Makefile.in
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk


 LIBRARY_NAME	= gfx_mac
-MODULE		= raptor
+MODULE		= layout
 IS_COMPONENT	= 1


@ -51,7 +51,7 @@ EXTRA_DSO_LDOPTS = \
                $(MKSHLIB_FORCE_ALL) \
                $(DIST)/lib/libimg_s.a \
                $(DIST)/lib/libmozutil_s.a \
-		-lraptorgfx \
+		-lgkgfx \
                $(MKSHLIB_UNFORCE_ALL) \
 		$(TK_LIBS) \
                $(MOZ_COMPONENT_LIBS) \
--- a/gfx/src/motif/Makefile.in
+++ b/gfx/src/motif/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfx_motif


--- a/gfx/src/os2/Makefile.in
+++ b/gfx/src/os2/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfx_os2


--- a/gfx/src/photon/Makefile.in
+++ b/gfx/src/photon/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfx_photon
 IS_COMPONENT	= 1

@ -54,7 +54,7 @@ CXXFLAGS	+= $(TK_CFLAGS)
 CFLAGS		+= $(TK_CFLAGS)

 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
-		-lraptorgfx \
+		-lgkgfx \
 		$(NULL)

 DEFINES		+= -D_IMPL_NS_GFXNONXP
--- a/gfx/src/ps/Makefile.in
+++ b/gfx/src/ps/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfxps
 IS_COMPONENT	= 1
 EXTRA_DSO_LIBS = img_s mozutil_s
@ -34,7 +34,7 @@ EXTRA_DSO_LIBS = img_s mozutil_s
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS += nggfx
 else
-EXTRA_DSO_LIBS += raptorgfx
+EXTRA_DSO_LIBS += gkgfx
 endif

 CSRCS		= font_metrics.c
@ -71,5 +71,3 @@ endif
 CFLAGS		+= $(TK_CFLAGS)
 CXXFLAGS	+= $(TK_CFLAGS)

-LLIBS		+= $(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorgfx.a
-
--- a/gfx/src/qt/Makefile.in
+++ b/gfx/src/qt/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfx_qt


--- a/gfx/src/rhapsody/Makefile.in
+++ b/gfx/src/rhapsody/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 #LIBRARY_NAME	= gfxunix
-MODULE		= raptor
+MODULE		= layout

 #CPPSRCS	= \
 #		nsDeviceContextUnix.cpp \
--- a/gfx/src/xlib/Makefile.in
+++ b/gfx/src/xlib/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfx_xlib


@ -55,7 +55,7 @@ endif
 EXTRA_DSO_LDOPTS += \
 		$(NSPR_LIBS)	\
 		-lxpcom			\
-		-lraptorgfx		\
+		-lgkgfx		\
 		$(NULL)

 DEFINES		+= -D_IMPL_NS_GFXNONXP
--- a/gfx/src/xlibrgb/Makefile.in
+++ b/gfx/src/xlibrgb/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= xlibrgb

 CSRCS		= xlibrgb.c
--- a/gfx/src/xprint/Makefile.in
+++ b/gfx/src/xprint/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout
 LIBRARY_NAME	= gfxxprt
 IS_COMPONENT	= 1

@ -63,7 +63,7 @@ endif
 CFLAGS		+= $(TK_CFLAGS)
 CXXFLAGS	+= $(TK_CFLAGS)

-LLIBS		+= $(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorgfx.a
+LLIBS		+= $(DIST)/lib/libxpcom.a $(DIST)/lib/libgkgfx.a

 INCLUDES	+= \
 		-I$(srcdir)/../gtk \
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@ -37,7 +37,7 @@ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS	= nggfx
 else
-EXTRA_DSO_LIBS	= raptorgfx
+EXTRA_DSO_LIBS	= gkgfx
 endif

 LIBS		= \
--- a/gfx/tests/coverage/Makefile.in
+++ b/gfx/tests/coverage/Makefile.in
@ -37,7 +37,7 @@ LIBS		= \
 		$(XPCOM_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_WIDGET_SUPPORT_LIBS) \
-		-lraptorgfx \
+		-lgkgfx \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
--- a/htmlparser/robot/test/RobotMain.cpp
+++ b/htmlparser/robot/test/RobotMain.cpp
@ -7,6 +7,8 @@

 #ifdef XP_PC
 #define PARSER_DLL "gkparser.dll"
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #else
 #define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
 #endif
--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= htmlparser
-LIBRARY_NAME	= raptorhtmlpars
+LIBRARY_NAME	= htmlpars
 IS_COMPONENT	= 1
 SHORT_LIBNAME	= htmlpars
 EXTRA_DSO_LIBS	= expat_s xmltok_s mozutil_s
--- a/htmlparser/tests/logparse/Makefile.in
+++ b/htmlparser/tests/logparse/Makefile.in
@ -31,7 +31,7 @@ PROGRAM		= logparse
 CPPSRCS		= logparse.cpp

 LIBS		= \
-		-lraptorhtmlpars \
+		-lhtmlpars \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/htmlparser/tests/logparse/logparse.cpp
+++ b/htmlparser/tests/logparse/logparse.cpp
@ -32,7 +32,7 @@
 #ifdef XP_MAC
 #endif
 #if defined(XP_UNIX) || defined(XP_BEOS)
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #endif

 // Class IID's
--- a/htmlparser/tests/outsinks/Convert.cpp
+++ b/htmlparser/tests/outsinks/Convert.cpp
@ -38,7 +38,7 @@ extern "C" void NS_SetupRegistry();
 #ifdef XP_MAC
 #endif
 #if defined(XP_UNIX) || defined(XP_BEOS)
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #endif

 // Class IID's
--- a/htmlparser/tests/outsinks/nsSetupRegistry.cpp
+++ b/htmlparser/tests/outsinks/nsSetupRegistry.cpp
@ -34,7 +34,7 @@
    #define DOM_DLL        "DOM_DLL"

 #else /* XP_UNIX etc. */
-    #define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+    #define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
    #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
 #endif

--- a/intl/strres/tests/StringBundleTest.cpp
+++ b/intl/strres/tests/StringBundleTest.cpp
@ -53,8 +53,8 @@
 #define RAPTORBASE_DLL "base.shlb"
 #define XPCOM_DLL "XPCOM_DLL"
 #else /* else XP_MAC */
-#define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
-#define RAPTORBASE_DLL "libraptorbase"MOZ_DLL_SUFFIX
+#define NETLIB_DLL "libnecko"MOZ_DLL_SUFFIX
+#define RAPTORBASE_DLL "libgklayout"MOZ_DLL_SUFFIX
 #define XPCOM_DLL "libxpcom"MOZ_DLL_SUFFIX
 #endif /* XP_MAC */
 #endif /* XP_PC */
--- a/layout/base/src/Makefile.in
+++ b/layout/base/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorlayout_s
+LIBRARY_NAME	= gkbase_s

 CPPSRCS		= \
 		nsAutoCopy.cpp \
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@ -33,8 +33,8 @@ CPPSRCS		= TestSpaceManager.cpp
 LOCAL_INCLUDES	= -I$(srcdir)/../src

 LIBS		+= \
-			$(DIST)/lib/libraptorlayout_s.a \
-			-lraptorgfx \
+			$(DIST)/lib/libgkbase_s.a \
+			-lgkgfx \
 			$(MOZ_JS_LIBS) \
 			$(XPCOM_LIBS) \
 			$(NSPR_LIBS) \
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 BUILD_DATE = gbdate.h

 MODULE		= layout
-LIBRARY_NAME	= raptorhtml
+LIBRARY_NAME	= gklayout
 SHORT_LIBNAME	= nglayout
 IS_COMPONENT	= 1
 EXTRA_DSO_LIBS	= jsdom
@ -37,7 +37,7 @@ EXTRA_DSO_LIBS	= jsdom
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS	+= nggfx
 else
-EXTRA_DSO_LIBS	+= raptorgfx
+EXTRA_DSO_LIBS	+= gkgfx
 endif


@ -54,19 +54,19 @@ endif
 EXPORTS		= nsLayoutCID.h $(BUILD_DATE)

 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libraptorevents_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmlbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnglhtmlcon_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmlforms_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmltable_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxmlcontent_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxulcontent_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxulbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxbl_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorlayout_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkevents_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlforms_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmltable_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxulcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxulbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxbl_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkbase_s.$(LIB_SUFFIX) \
 		$(NULL)

 ifdef MOZ_PERF_METRICS
@ -77,21 +77,21 @@ endif

 ifdef MOZ_MATHML
 SHARED_LIBRARY_LIBS += \
-                $(DIST)/lib/libraptormathmlcontent_s.$(LIB_SUFFIX) \
-                $(DIST)/lib/libraptormathmlbase_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/libgkmathmlcon_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/libgkmathmlbase_s.$(LIB_SUFFIX) \
                $(NSNULL)
 endif

 ifdef MOZ_SVG
 SHARED_LIBRARY_LIBS += \
-                $(DIST)/lib/libraptorsvgcontent_s.$(LIB_SUFFIX) \
-                $(DIST)/lib/libraptorsvgbase_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/libgksvgcon_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/libgksvgbase_s.$(LIB_SUFFIX) \
                $(NSNULL)
 endif

 ifdef MOZ_XSL
 SHARED_LIBRARY_LIBS += \
-                $(DIST)/lib/libraptorxsldoc_s.$(LIB_SUFFIX) \
+                $(DIST)/lib/libgkxsldoc_s.$(LIB_SUFFIX) \
                $(NSNULL)
 endif

--- a/layout/events/src/Makefile.in
+++ b/layout/events/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorevents_s
+LIBRARY_NAME	= gkevents_s


 CPPSRCS		= \
--- a/layout/html/base/src/Makefile.in
+++ b/layout/html/base/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorhtmlbase_s
+LIBRARY_NAME	= gkhtmlbase_s


 CPPSRCS		= \
--- a/layout/html/content/src/Makefile.in
+++ b/layout/html/content/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= nglhtmlcon_s
+LIBRARY_NAME	= gkhtmlcon_s


 CPPSRCS		= \
--- a/layout/html/document/src/Makefile.in
+++ b/layout/html/document/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorhtmldoc_s
+LIBRARY_NAME	= gkhtmldoc_s


 CPPSRCS		= \
@ -63,7 +63,6 @@ INCLUDES	+= \
 		-I$(srcdir)/../../style/src \
 		-I$(srcdir)/../../table/src \
 		-I$(srcdir)/../../dom \
-		-I$(DIST)/public/raptor \
 		$(NULL)

 GARBAGE		+= $(DIST)/bin/res/ua.css $(DIST)/bin/res/html.css $(DIST)/bin/res/quirk.css $(DIST)/bin/res/arrow.gif
--- a/layout/html/forms/src/Makefile.in
+++ b/layout/html/forms/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorhtmlforms_s
+LIBRARY_NAME	= gkhtmlforms_s


 CPPSRCS		= \
--- a/layout/html/style/src/Makefile.in
+++ b/layout/html/style/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorhtmlstyle_s
+LIBRARY_NAME	= gkhtmlstyle_s


 CPPSRCS		= \
--- a/layout/html/table/public/Makefile.in
+++ b/layout/html/table/public/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= layout

 EXPORTS		= \
 		nsITableCellLayout.h \
--- a/layout/html/table/src/Makefile.in
+++ b/layout/html/table/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorhtmltable_s
+LIBRARY_NAME	= gkhtmltable_s


 CPPSRCS		= \
--- a/layout/html/tests/Makefile.in
+++ b/layout/html/tests/Makefile.in
@ -39,24 +39,24 @@ LOCAL_INCLUDES	= -I$(srcdir)/../style/src
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS += nggfx
 else
-EXTRA_DSO_LIBS += raptorgfx
+EXTRA_DSO_LIBS += gkgfx
 endif

 EXTRA_DSO_LIBS += jsdom

 LIBS		= \
-		$(DIST)/lib/libraptorhtmlbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libnglhtmlcon_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmlforms_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmlstyle_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorhtmltable_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorlayout_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorevents_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxmlcontent_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxmldoc_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxulbase_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libraptorxulcontent_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlforms_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmlstyle_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkhtmltable_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkevents_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxmlcon_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxmldoc_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxulbase_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libgkxulcon_s.$(LIB_SUFFIX) \
 		$(MOZ_JS_LIBS) \
 		$(EXTRA_DSO_LIBS) \
 		$(TK_LIBS) \
--- a/layout/html/tests/TestCSSParser.cpp
+++ b/layout/html/tests/TestCSSParser.cpp
@ -50,9 +50,9 @@
 #ifdef XP_MAC
 #include "nsMacRepository.h"
 #else
-#define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
+#define NETLIB_DLL "libnecko"MOZ_DLL_SUFFIX
 #define XPCOM_DLL  "libxpcom"MOZ_DLL_SUFFIX
-#define LAYOUT_DLL    "libraptorhtml"MOZ_DLL_SUFFIX
+#define LAYOUT_DLL    "libgklayout"MOZ_DLL_SUFFIX
 #endif
 #endif

--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = raptormathmlbase_s
+LIBRARY_NAME = gkmathmlbase_s

 LOCAL_INCLUDES = \
 	-I$(srcdir)/../../../base/src		\
--- a/layout/mathml/content/src/Makefile.in
+++ b/layout/mathml/content/src/Makefile.in
@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk

 include $(topsrcdir)/config/config.mk

-LIBRARY_NAME = raptormathmlcontent_s
+LIBRARY_NAME = gkmathmlcon_s

 DEFINES += -D_IMPL_NS_HTML

--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorsvgbase_s
+LIBRARY_NAME	= gksvgbase_s

 CPPSRCS		= \
  nsSVGContainerFrame.cpp \
--- a/layout/svg/content/src/Makefile.in
+++ b/layout/svg/content/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorsvgcontent_s
+LIBRARY_NAME	= gksvgcon_s


 CPPSRCS		= nsSVGAtoms.cpp
@ -40,5 +40,5 @@ include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_HTML

-INCLUDES	+= -I$(srcdir)/../../../base/src -I$(DIST)/public/raptor
+INCLUDES	+= -I$(srcdir)/../../../base/src

--- a/layout/xbl/src/Makefile.in
+++ b/layout/xbl/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxbl_s
+LIBRARY_NAME	= gkxbl_s

 CPPSRCS		= \
    nsXBLBinding.cpp \
--- a/layout/xml/content/src/Makefile.in
+++ b/layout/xml/content/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxmlcontent_s
+LIBRARY_NAME	= gkxmlcon_s


 CPPSRCS		= \
@ -54,6 +54,5 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../html/document/src \
 		-I$(srcdir)/../../../html/style/src \
 		-I$(srcdir)/../../../base/src \
-		-I$(DIST)/public/raptor \
 		$(NULL)

--- a/layout/xml/document/src/Makefile.in
+++ b/layout/xml/document/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxmldoc_s
+LIBRARY_NAME	= gkxmldoc_s


 CPPSRCS		= \
@ -56,6 +56,5 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../html/style/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../xul/content/src \
-		-I$(DIST)/public/raptor \
 		$(NULL)

--- a/layout/xsl/document/src/Makefile.in
+++ b/layout/xsl/document/src/Makefile.in
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk

 include $(topsrcdir)/config/config.mk

-LIBRARY_NAME = raptorxsldoc_s
+LIBRARY_NAME = gkxsldoc_s

 DEFINES += -D_IMPL_NS_HTML

--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxulbase_s
+LIBRARY_NAME	= gkxulbase_s

 CPPSRCS		= \
       nsScrollBoxObject.cpp \
--- a/layout/xul/content/src/Makefile.in
+++ b/layout/xul/content/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= layout
-LIBRARY_NAME	= raptorxulcontent_s
+LIBRARY_NAME	= gkxulcon_s


 CPPSRCS		= nsXULAtoms.cpp
@ -40,5 +40,5 @@ include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_HTML

-INCLUDES	+= -I$(srcdir)/../../../base/src -I$(DIST)/public/raptor
+INCLUDES	+= -I$(srcdir)/../../../base/src

--- a/mailnews/compose/tests/compose2/Makefile.in
+++ b/mailnews/compose/tests/compose2/Makefile.in
@ -33,7 +33,7 @@ CPPSRCS		= test2.cpp
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS	= nggfx msgbutil
 else
-EXTRA_DSO_LIBS	= raptorgfx msgbaseutil
+EXTRA_DSO_LIBS	= gkgfx msgbaseutil
 endif

 LIBS		= \
--- a/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mailnews/compose/tests/sendlater/Makefile.in
@ -33,7 +33,7 @@ CPPSRCS		= test.cpp
 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS	= nggfx msgbutil
 else
-EXTRA_DSO_LIBS	= raptorgfx msgbaseutil
+EXTRA_DSO_LIBS	= gkgfx msgbaseutil
 endif

 LIBS		= \
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -26,8 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
-LIBRARY_NAME	= raptorplugin
+MODULE		= layout
+LIBRARY_NAME	= gkplugin
 SHORT_LIBNAME	= ngplugin


--- a/modules/plugin/nglsrc/Makefile.in
+++ b/modules/plugin/nglsrc/Makefile.in
@ -26,8 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
-LIBRARY_NAME	= raptorplugin
+MODULE		= layout
+LIBRARY_NAME	= gkplugin
 SHORT_LIBNAME	= ngplugin


--- a/parser/htmlparser/robot/test/RobotMain.cpp
+++ b/parser/htmlparser/robot/test/RobotMain.cpp
@ -7,6 +7,8 @@

 #ifdef XP_PC
 #define PARSER_DLL "gkparser.dll"
+#elif defined(XP_UNIX) || defined(XP_BEOS)
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #else
 #define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
 #endif
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= htmlparser
-LIBRARY_NAME	= raptorhtmlpars
+LIBRARY_NAME	= htmlpars
 IS_COMPONENT	= 1
 SHORT_LIBNAME	= htmlpars
 EXTRA_DSO_LIBS	= expat_s xmltok_s mozutil_s
--- a/parser/htmlparser/tests/logparse/Makefile.in
+++ b/parser/htmlparser/tests/logparse/Makefile.in
@ -31,7 +31,7 @@ PROGRAM		= logparse
 CPPSRCS		= logparse.cpp

 LIBS		= \
-		-lraptorhtmlpars \
+		-lhtmlpars \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/parser/htmlparser/tests/logparse/logparse.cpp
+++ b/parser/htmlparser/tests/logparse/logparse.cpp
@ -32,7 +32,7 @@
 #ifdef XP_MAC
 #endif
 #if defined(XP_UNIX) || defined(XP_BEOS)
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #endif

 // Class IID's
--- a/parser/htmlparser/tests/outsinks/Convert.cpp
+++ b/parser/htmlparser/tests/outsinks/Convert.cpp
@ -38,7 +38,7 @@ extern "C" void NS_SetupRegistry();
 #ifdef XP_MAC
 #endif
 #if defined(XP_UNIX) || defined(XP_BEOS)
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #endif

 // Class IID's
--- a/parser/htmlparser/tests/outsinks/nsSetupRegistry.cpp
+++ b/parser/htmlparser/tests/outsinks/nsSetupRegistry.cpp
@ -34,7 +34,7 @@
    #define DOM_DLL        "DOM_DLL"

 #else /* XP_UNIX etc. */
-    #define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+    #define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
    #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
 #endif

--- a/rdf/brprof/server/nsBrowsingProfileReader.cpp
+++ b/rdf/brprof/server/nsBrowsingProfileReader.cpp
@ -411,9 +411,9 @@ nsBrowsingProfileReader::GetCategory(PRInt32 aCategoryID, nsXPIDLCString& aCateg
 #define XPCOM_DLL  "xpcom32.dll"
 #elif defined(XP_UNIX) || defined(XP_BEOS)
 #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
-#define LAYOUT_DLL "libraptorhtml"MOZ_DLL_SUFFIX
-#define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define LAYOUT_DLL "libgklayout"MOZ_DLL_SUFFIX
+#define NETLIB_DLL "libnecko"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #define RDF_DLL    "librdf"MOZ_DLL_SUFFIX
 #define XPCOM_DLL  "libxpcom"MOZ_DLL_SUFFIX
 #elif defined(XP_MAC)
--- a/rdf/tests/localfile/localfile.cpp
+++ b/rdf/tests/localfile/localfile.cpp
@ -72,9 +72,9 @@
 #define XPCOM_DLL  "xpcom32.dll"
 #elif defined(XP_UNIX) || defined(XP_BEOS)
 #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
-#define LAYOUT_DLL "libraptorhtml"MOZ_DLL_SUFFIX
-#define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define LAYOUT_DLL "libgklayout"MOZ_DLL_SUFFIX
+#define NETLIB_DLL "libnecko"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libtmlpars"MOZ_DLL_SUFFIX
 #define RDF_DLL    "librdf"MOZ_DLL_SUFFIX
 #define XPCOM_DLL  "libxpcom"MOZ_DLL_SUFFIX
 #elif defined(XP_MAC)
--- a/rdf/tests/rdfpoll/rdfpoll.cpp
+++ b/rdf/tests/rdfpoll/rdfpoll.cpp
@ -67,9 +67,9 @@
 #define XPCOM_DLL  "xpcom32.dll"
 #elif defined(XP_UNIX) || defined(XP_BEOS)
 #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
-#define LAYOUT_DLL "libraptorhtml"MOZ_DLL_SUFFIX
-#define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define LAYOUT_DLL "libgklayout"MOZ_DLL_SUFFIX
+#define NETLIB_DLL "libnecko"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #define RDF_DLL    "librdf"MOZ_DLL_SUFFIX
 #define XPCOM_DLL  "libxpcom"MOZ_DLL_SUFFIX
 #elif defined(XP_MAC)
--- a/rdf/tests/rdfsink/rdfsink.cpp
+++ b/rdf/tests/rdfsink/rdfsink.cpp
@ -52,9 +52,9 @@
 #define XPCOM_DLL  "xpcom32.dll"
 #elif defined(XP_UNIX) || defined(XP_BEOS)
 #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
-#define LAYOUT_DLL "libraptorhtml"MOZ_DLL_SUFFIX
-#define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
-#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
+#define LAYOUT_DLL "libgklayout"MOZ_DLL_SUFFIX
+#define NETLIB_DLL "libnecko"MOZ_DLL_SUFFIX
+#define PARSER_DLL "libhtmlpars"MOZ_DLL_SUFFIX
 #define RDF_DLL    "librdf"MOZ_DLL_SUFFIX
 #define XPCOM_DLL  "libxpcom"MOZ_DLL_SUFFIX
 #elif defined(XP_MAC)
--- a/view/public/Makefile.in
+++ b/view/public/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= view

 EXPORTS		= \
 		nsIView.h \
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@ -26,15 +26,15 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
-LIBRARY_NAME	= raptorview
+MODULE		= view
+LIBRARY_NAME	= gkview
 SHORT_LIBNAME	= ngview
 IS_COMPONENT    = 1

 ifeq ($(USE_SHORT_LIBNAME),1)
 EXTRA_DSO_LIBS = nggfx
 else
-EXTRA_DSO_LIBS = raptorgfx
+EXTRA_DSO_LIBS = gkgfx
 endif

 CPPSRCS		= \
--- a/webshell/embed/xlib/gtk/Makefile.in
+++ b/webshell/embed/xlib/gtk/Makefile.in
@ -34,7 +34,7 @@ CPPSRCS		= \
 		$(NULL)

 LIBS		= \
-		-lraptorgfx \
+		-lgkgfx \
 		$(NETLIB_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
--- a/webshell/embed/xlib/motif/Makefile.in
+++ b/webshell/embed/xlib/motif/Makefile.in
@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PROGRAM		= embed_xlib_into_motif
-
-CSRCS		= EmbedMozilla.c
-
-CPPSRCS		= \
-		nsEmbedXlibIntoMotif.cpp \
-		nsSetupRegistry.cpp \
-		$(NULL)
-
-LIBS		= \
-		-lraptorgfx \
-		$(NETLIB_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(XPCOM_LIBS) \
-		$(JSJ_LIB) \
-		$(NSPR_LIBS) \
-		$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
--- a/webshell/embed/xlib/qt/Makefile.in
+++ b/webshell/embed/xlib/qt/Makefile.in
@ -43,7 +43,7 @@ CPPSRCS		= \
 		$(NULL)

 LIBS		= \
-		-lraptorgfx \
+		-lgkgfx \
 		$(NETLIB_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
--- a/webshell/embed/xlib/xt/Makefile.in
+++ b/webshell/embed/xlib/xt/Makefile.in
@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation.  Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation.  All Rights Reserved.
-#
-# Contributor(s):
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PROGRAM		= embed_xlib_into_xt
-
-CSRCS		= EmbedMozilla.c
-
-CPPSRCS		= \
-		nsEmbedXlibIntoXt.cpp \
-		nsSetupRegistry.cpp \
-		$(NULL)
-
-LIBS		= \
-		-lraptorgfx \
-		$(NETLIB_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(XPCOM_LIBS) \
-		$(JSJ_LIB) \
-		$(NSPR_LIBS) \
-		$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS	+= $(MOZ_MOTIF_CFLAGS)
-
--- a/webshell/public/Makefile.in
+++ b/webshell/public/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= webshell

 EXPORTS		= \
 		nsIClipboardCommands.h \
--- a/webshell/src/Makefile.in
+++ b/webshell/src/Makefile.in
@ -26,8 +26,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
-LIBRARY_NAME	= raptorwebwidget
+MODULE		= webshell
+LIBRARY_NAME	= webshell
 SHORT_LIBNAME	= webshell
 EXTRA_DSO_LIBS	= jsdom docshell

--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -101,7 +101,7 @@ JSJ_LIB			= -ljsj
 endif

 XP_DIST_LIBS		= \
-			-lraptorgfx \
+			-lgkgfx \
 			$(MOZ_JS_LIBS) \
 			$(XPCOM_LIBS) \
 			$(JSJ_LIB) \
--- a/webshell/tests/viewer/nsSetupRegistry.cpp
+++ b/webshell/tests/viewer/nsSetupRegistry.cpp
@ -87,10 +87,10 @@
    #define LIVECONNECT_DLL "LIVECONNECT_DLL"
    #define OJI_DLL        "OJI_DLL"
 #else
-    #define VIEW_DLL   "libraptorview"MOZ_DLL_SUFFIX
-    #define WEB_DLL    "libraptorwebwidget"MOZ_DLL_SUFFIX
+    #define VIEW_DLL   "libgkview"MOZ_DLL_SUFFIX
+    #define WEB_DLL    "libwebshell"MOZ_DLL_SUFFIX
    #define DOM_DLL    "libjsdom"MOZ_DLL_SUFFIX
-    #define PLUGIN_DLL "libraptorplugin"MOZ_DLL_SUFFIX
+    #define PLUGIN_DLL "libgkplugin"MOZ_DLL_SUFFIX
    #define CAPS_DLL   "libcaps"MOZ_DLL_SUFFIX
    #define LIVECONNECT_DLL "libliveconnect"MOZ_DLL_SUFFIX
    #define OJI_DLL    "liboji"MOZ_DLL_SUFFIX
--- a/widget/public/Makefile.in
+++ b/widget/public/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor
+MODULE		= widget
 XPIDL_MODULE	= widget

 EXPORTS		= \
--- a/widget/src/beos/Makefile.in
+++ b/widget/src/beos/Makefile.in
@ -56,13 +56,13 @@ CPPSRCS		= \
 		nsWindow.cpp \
 		$(NULL)

-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a

 EXTRA_DSO_LDOPTS = \
 		-ltimer_beos \
 		$(TOOLKIT_DSO_LDOPTS) \
 		$(MOZ_COMPONENT_LIBS) \
-		-lraptorgfx \
+		-lgkgfx \
 		$(TK_LIBS) \
 		$(NULL)

--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@ -38,8 +38,8 @@ LOCAL_INCLUDES	= \
 		$(NULL)

 SHARED_LIBRARY_LIBS = \
-		$(addprefix $(DIST)/lib/libraptorwidget,$(addsuffix _s.$(LIB_SUFFIX),$(MOZ_WIDGET_TOOLKIT))) \
-		$(DIST)/lib/libraptorbasewidget_s.$(LIB_SUFFIX) \
+		$(addprefix $(DIST)/lib/libwidget,$(addsuffix _s.$(LIB_SUFFIX),$(MOZ_WIDGET_TOOLKIT))) \
+		$(DIST)/lib/libxpwidgets_s.$(LIB_SUFFIX) \
 		$(NULL)

 EXTRA_DSO_LDOPTS = \
--- a/widget/src/gtk/Makefile.in
+++ b/widget/src/gtk/Makefile.in
@ -54,11 +54,11 @@ CPPSRCS		= \
 		nsGtkMozRemoteHelper.cpp \
 		$(NULL)

-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a

 EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
-		-lraptorgfx \
+		-lgkgfx \
 		$(NULL)

 ifndef MOZ_MONOLITHIC_TOOLKIT
--- a/widget/src/mac/Makefile.in
+++ b/widget/src/mac/Makefile.in
@ -62,9 +62,9 @@ CPPSRCS         = nsAppShell.cpp \
 include $(topsrcdir)/config/rules.mk

 EXTRA_DSO_LDOPTS += \
-                $(DIST)/lib/libraptorbasewidget_s.a \
+                $(DIST)/lib/libxpwidgets_s.a \
                $(TK_LIBS) \
-                -lraptorgfx \
+                -lgkgfx \
                $(MOZ_COMPONENT_LIBS) \
                $(NULL)

--- a/widget/src/motif/Makefile.in
+++ b/widget/src/motif/Makefile.in
@ -56,7 +56,7 @@ CPPSRCS		= \
 		nsXtManageWidget.cpp \
 		$(NULL)

-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a

 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_MOTIF_LDFLAGS)
--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@ -71,7 +71,7 @@ CPPSRCS		= \
 #              nsTabWidget.cpp \
 #              nsTooltipWidget.cpp \

-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.$(LIB_SUFFIX)

 EXTRA_DSO_LDOPTS = \
 	  	$(EXTRA_DSO_LIBS) \
--- a/widget/src/os2/tests/Makefile.in
+++ b/widget/src/os2/tests/Makefile.in
@ -1,37 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the Mozilla OS/2 libraries.
-#
-# The Initial Developer of the Original Code is John Fairhurst,
-# <john_fairhurst@iname.com>.  Portions created by John Fairhurst are
-# Copyright (C) 1999 John Fairhurst. All Rights Reserved.
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= raptor
-
-SIMPLE_PROGRAMS = dirpicker$(BIN_SUFFIX)
-
-CPPSRCS		= dirpicker.cpp
-
-LIBS		= $(DIST)/lib/wdgtos2.lib
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= -I$(srcdir)/..
-
--- a/widget/src/photon/Makefile.in
+++ b/widget/src/photon/Makefile.in
@ -64,7 +64,7 @@ CPPSRCS		= \
 		nsWindow.cpp \
 		$(NULL)

-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a

 EXTRA_DSO_LDOPTS = \
 		$(TOOLKIT_DSO_LDOPTS) \
--- a/widget/src/qt/Makefile.in
+++ b/widget/src/qt/Makefile.in
@ -73,7 +73,7 @@ MOCSRCS		= \
 		moc_nsWindow.cpp \
 		$(NULL)

-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a

 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(MOZ_QT_LDFLAGS) -lxlibrgb $(MOZ_XLIB_LDFLAGS)
--- a/widget/src/xlib/Makefile.in
+++ b/widget/src/xlib/Makefile.in
@ -57,7 +57,7 @@ CPPSRCS		= \
 		nsXUtils.cpp \
 		$(NULL)

-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
+SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpwidgets_s.a

 ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@ -26,7 +26,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME	= raptorbasewidget_s
+LIBRARY_NAME	= xpwidgets_s

 CPPSRCS		= \
 		nsBaseWidget.cpp \
--- a/widget/tests/scribble/Makefile.in
+++ b/widget/tests/scribble/Makefile.in
@ -1,48 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PROGRAM		= scribble
-
-CPPSRCS		= \
-		Scribble.cpp \
-		main.cpp \
-		$(NULL)
-
-LIBS		= \
-		$(MOZ_WIDGET_SUPPORT_LIBS) \
-		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
-		-lraptorgfx \
-		$(NSPR_LIBS) \
-		$(TK_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
-
--- a/widget/tests/widget/Makefile.in
+++ b/widget/tests/widget/Makefile.in
@ -1,48 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PROGRAM		= widget
-
-CPPSRCS		= \
-		main.cpp \
-		nsWidgetTest.cpp \
-		$(NULL)
-
-LIBS		= \
-		$(MOZ_WIDGET_SUPPORT_LIBS) \
-		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
-		-lraptorgfx \
-		$(NSPR_LIBS) \
-		$(TK_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS	+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
-
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@ -27,7 +27,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 IS_COMPONENT=1
-MODULE		= raptor
+MODULE		= appshell
 LIBRARY_NAME	= nsappshell
 SHORT_LIBNAME	= appshell

--- a/Показать больше
+++ b/Показать больше