From 7fb57d53adbdcb8655e33b3299edee2164ee2072 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sun, 2 Jul 2000 18:44:42 +0000 Subject: [PATCH] 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 git-svn-id: svn://10.0.0.236/trunk@73643 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/rules.mk | 3 +- mozilla/content/events/src/Makefile.in | 2 +- mozilla/content/html/content/src/Makefile.in | 2 +- mozilla/content/xbl/src/Makefile.in | 2 +- mozilla/content/xml/content/src/Makefile.in | 3 +- mozilla/content/xml/document/src/Makefile.in | 3 +- mozilla/content/xsl/document/src/Makefile.in | 2 +- mozilla/dom/public/idl/base/Makefile.in | 2 +- mozilla/dom/public/idl/coreDom/Makefile.in | 2 +- mozilla/dom/public/idl/css/Makefile.in | 2 +- mozilla/dom/public/idl/events/Makefile.in | 2 +- mozilla/dom/public/idl/html/Makefile.in | 2 +- mozilla/dom/public/idl/range/Makefile.in | 2 +- .../extensions/xmlterm/geckoterm/Makefile.in | 2 +- mozilla/gfx/idl/Makefile.in | 2 +- mozilla/gfx/public/Makefile.in | 2 +- mozilla/gfx/src/Makefile.in | 4 +- mozilla/gfx/src/beos/Makefile.in | 4 +- mozilla/gfx/src/gtk/Makefile.in | 4 +- mozilla/gfx/src/mac/Makefile.in | 4 +- mozilla/gfx/src/motif/Makefile.in | 2 +- mozilla/gfx/src/os2/Makefile.in | 2 +- mozilla/gfx/src/photon/Makefile.in | 4 +- mozilla/gfx/src/ps/Makefile.in | 6 +-- mozilla/gfx/src/qt/Makefile.in | 2 +- mozilla/gfx/src/rhapsody/Makefile.in | 2 +- mozilla/gfx/src/xlib/Makefile.in | 4 +- mozilla/gfx/src/xlibrgb/Makefile.in | 2 +- mozilla/gfx/src/xprint/Makefile.in | 4 +- mozilla/gfx/tests/Makefile.in | 2 +- mozilla/gfx/tests/coverage/Makefile.in | 2 +- mozilla/htmlparser/robot/test/RobotMain.cpp | 2 + mozilla/htmlparser/src/Makefile.in | 2 +- mozilla/htmlparser/tests/logparse/Makefile.in | 2 +- .../htmlparser/tests/logparse/logparse.cpp | 2 +- mozilla/htmlparser/tests/outsinks/Convert.cpp | 2 +- .../tests/outsinks/nsSetupRegistry.cpp | 2 +- .../intl/strres/tests/StringBundleTest.cpp | 4 +- mozilla/layout/base/src/Makefile.in | 2 +- mozilla/layout/base/tests/Makefile.in | 4 +- mozilla/layout/build/Makefile.in | 40 +++++++++---------- mozilla/layout/events/src/Makefile.in | 2 +- mozilla/layout/html/base/src/Makefile.in | 2 +- mozilla/layout/html/content/src/Makefile.in | 2 +- mozilla/layout/html/document/src/Makefile.in | 3 +- mozilla/layout/html/forms/src/Makefile.in | 2 +- mozilla/layout/html/style/src/Makefile.in | 2 +- mozilla/layout/html/table/public/Makefile.in | 2 +- mozilla/layout/html/table/src/Makefile.in | 2 +- mozilla/layout/html/tests/Makefile.in | 26 ++++++------ mozilla/layout/html/tests/TestCSSParser.cpp | 4 +- mozilla/layout/mathml/base/src/Makefile.in | 2 +- mozilla/layout/mathml/content/src/Makefile.in | 2 +- mozilla/layout/svg/base/src/Makefile.in | 2 +- mozilla/layout/svg/content/src/Makefile.in | 4 +- mozilla/layout/xbl/src/Makefile.in | 2 +- mozilla/layout/xml/content/src/Makefile.in | 3 +- mozilla/layout/xml/document/src/Makefile.in | 3 +- mozilla/layout/xsl/document/src/Makefile.in | 2 +- mozilla/layout/xul/base/src/Makefile.in | 2 +- mozilla/layout/xul/content/src/Makefile.in | 4 +- .../compose/tests/compose2/Makefile.in | 2 +- .../compose/tests/sendlater/Makefile.in | 2 +- mozilla/modules/plugin/base/src/Makefile.in | 4 +- mozilla/modules/plugin/nglsrc/Makefile.in | 4 +- .../htmlparser/robot/test/RobotMain.cpp | 2 + mozilla/parser/htmlparser/src/Makefile.in | 2 +- .../htmlparser/tests/logparse/Makefile.in | 2 +- .../htmlparser/tests/logparse/logparse.cpp | 2 +- .../htmlparser/tests/outsinks/Convert.cpp | 2 +- .../tests/outsinks/nsSetupRegistry.cpp | 2 +- .../brprof/server/nsBrowsingProfileReader.cpp | 6 +-- mozilla/rdf/tests/localfile/localfile.cpp | 6 +-- mozilla/rdf/tests/rdfpoll/rdfpoll.cpp | 6 +-- mozilla/rdf/tests/rdfsink/rdfsink.cpp | 6 +-- mozilla/view/public/Makefile.in | 2 +- mozilla/view/src/Makefile.in | 6 +-- mozilla/webshell/embed/xlib/gtk/Makefile.in | 2 +- mozilla/webshell/embed/xlib/motif/Makefile.in | 2 +- mozilla/webshell/embed/xlib/qt/Makefile.in | 2 +- mozilla/webshell/embed/xlib/xt/Makefile.in | 2 +- mozilla/webshell/public/Makefile.in | 2 +- mozilla/webshell/src/Makefile.in | 4 +- mozilla/webshell/tests/viewer/Makefile.in | 2 +- .../webshell/tests/viewer/nsSetupRegistry.cpp | 6 +-- mozilla/widget/public/Makefile.in | 2 +- mozilla/widget/src/beos/Makefile.in | 4 +- mozilla/widget/src/build/Makefile.in | 4 +- mozilla/widget/src/gtk/Makefile.in | 4 +- mozilla/widget/src/mac/Makefile.in | 4 +- mozilla/widget/src/motif/Makefile.in | 2 +- mozilla/widget/src/os2/Makefile.in | 2 +- mozilla/widget/src/os2/tests/Makefile.in | 2 +- mozilla/widget/src/photon/Makefile.in | 2 +- mozilla/widget/src/qt/Makefile.in | 2 +- mozilla/widget/src/xlib/Makefile.in | 2 +- mozilla/widget/src/xpwidgets/Makefile.in | 2 +- mozilla/widget/tests/scribble/Makefile.in | 2 +- mozilla/widget/tests/widget/Makefile.in | 2 +- mozilla/xpfe/appshell/src/Makefile.in | 2 +- mozilla/xpfe/bootstrap/Makefile.in | 4 +- mozilla/xpinstall/packager/packages-unix | 12 +++--- 102 files changed, 174 insertions(+), 176 deletions(-) diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index e6809e5a009..23220c77abc 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/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 diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in index bdc0bc79cf1..80015999b35 100644 --- a/mozilla/content/events/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index 91ba1c6231f..27213ece150 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index 0a7689c0b7d..16a59d6b4cc 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 029997678b9..561133ef56f 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index f9405a891f2..50e77d8a526 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/content/xsl/document/src/Makefile.in b/mozilla/content/xsl/document/src/Makefile.in index 4735aea49fd..2c5d61ac286 100755 --- a/mozilla/content/xsl/document/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/dom/public/idl/base/Makefile.in b/mozilla/dom/public/idl/base/Makefile.in index 8cf15829a9a..a987a7457a6 100644 --- a/mozilla/dom/public/idl/base/Makefile.in +++ b/mozilla/dom/public/idl/base/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout GLOBALIDLSRCS = \ Window.idl \ diff --git a/mozilla/dom/public/idl/coreDom/Makefile.in b/mozilla/dom/public/idl/coreDom/Makefile.in index 554e0fcd598..592602c5276 100644 --- a/mozilla/dom/public/idl/coreDom/Makefile.in +++ b/mozilla/dom/public/idl/coreDom/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout IDLSRCS = \ Attr.idl \ diff --git a/mozilla/dom/public/idl/css/Makefile.in b/mozilla/dom/public/idl/css/Makefile.in index b315192ee55..4ddfca7b705 100644 --- a/mozilla/dom/public/idl/css/Makefile.in +++ b/mozilla/dom/public/idl/css/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout IDLSRCS = \ CSS2Properties.idl \ diff --git a/mozilla/dom/public/idl/events/Makefile.in b/mozilla/dom/public/idl/events/Makefile.in index 9c1c2907426..aac842fb343 100644 --- a/mozilla/dom/public/idl/events/Makefile.in +++ b/mozilla/dom/public/idl/events/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout IDLSRCS = \ Event.idl \ diff --git a/mozilla/dom/public/idl/html/Makefile.in b/mozilla/dom/public/idl/html/Makefile.in index dc6577d9a7c..c79e07e66d3 100644 --- a/mozilla/dom/public/idl/html/Makefile.in +++ b/mozilla/dom/public/idl/html/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout IDLSRCS = \ HTMLIFrameElement.idl \ diff --git a/mozilla/dom/public/idl/range/Makefile.in b/mozilla/dom/public/idl/range/Makefile.in index e12d99eda40..cf92d40ef6e 100644 --- a/mozilla/dom/public/idl/range/Makefile.in +++ b/mozilla/dom/public/idl/range/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout IDLSRCS = \ Range.idl \ diff --git a/mozilla/extensions/xmlterm/geckoterm/Makefile.in b/mozilla/extensions/xmlterm/geckoterm/Makefile.in index 3ddf536be12..b9681c9e77e 100644 --- a/mozilla/extensions/xmlterm/geckoterm/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/gfx/idl/Makefile.in b/mozilla/gfx/idl/Makefile.in index cbb1decadcd..ad1fc2bd7e7 100644 --- a/mozilla/gfx/idl/Makefile.in +++ b/mozilla/gfx/idl/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout XPIDL_MODULE = gfx XPIDLSRCS = \ diff --git a/mozilla/gfx/public/Makefile.in b/mozilla/gfx/public/Makefile.in index af55b8e1552..0b8e1495d43 100644 --- a/mozilla/gfx/public/Makefile.in +++ b/mozilla/gfx/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout EXPORTS = \ nsColor.h \ diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index 08a47d80a00..ddf32592b4e 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/gfx/src/beos/Makefile.in b/mozilla/gfx/src/beos/Makefile.in index f3e92c8c9f6..71d99ceb466 100644 --- a/mozilla/gfx/src/beos/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in index 3d2b45166fa..9249eaabaf1 100644 --- a/mozilla/gfx/src/gtk/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/gfx/src/mac/Makefile.in b/mozilla/gfx/src/mac/Makefile.in index 25b1ee76aa4..267a30dbc33 100644 --- a/mozilla/gfx/src/mac/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/gfx/src/motif/Makefile.in b/mozilla/gfx/src/motif/Makefile.in index ade0338f63b..aa0b59e260d 100644 --- a/mozilla/gfx/src/motif/Makefile.in +++ b/mozilla/gfx/src/motif/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout LIBRARY_NAME = gfx_motif diff --git a/mozilla/gfx/src/os2/Makefile.in b/mozilla/gfx/src/os2/Makefile.in index 3f37393451c..fa37df2a070 100644 --- a/mozilla/gfx/src/os2/Makefile.in +++ b/mozilla/gfx/src/os2/Makefile.in @@ -27,7 +27,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout LIBRARY_NAME = gfx_os2 diff --git a/mozilla/gfx/src/photon/Makefile.in b/mozilla/gfx/src/photon/Makefile.in index 1c38e58cc04..a96bfd2a377 100644 --- a/mozilla/gfx/src/photon/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/gfx/src/ps/Makefile.in b/mozilla/gfx/src/ps/Makefile.in index bbf02f1c792..95b4fe2295f 100644 --- a/mozilla/gfx/src/ps/Makefile.in +++ b/mozilla/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 - diff --git a/mozilla/gfx/src/qt/Makefile.in b/mozilla/gfx/src/qt/Makefile.in index 105892e7211..e668318447f 100644 --- a/mozilla/gfx/src/qt/Makefile.in +++ b/mozilla/gfx/src/qt/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout LIBRARY_NAME = gfx_qt diff --git a/mozilla/gfx/src/rhapsody/Makefile.in b/mozilla/gfx/src/rhapsody/Makefile.in index 6e42086a1ce..cc3973431db 100644 --- a/mozilla/gfx/src/rhapsody/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in index 55eded192d8..7ef3d64c372 100644 --- a/mozilla/gfx/src/xlib/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/gfx/src/xlibrgb/Makefile.in b/mozilla/gfx/src/xlibrgb/Makefile.in index f841673e50a..73236f788a8 100644 --- a/mozilla/gfx/src/xlibrgb/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/gfx/src/xprint/Makefile.in b/mozilla/gfx/src/xprint/Makefile.in index 23f419534f5..47777ea7cb2 100644 --- a/mozilla/gfx/src/xprint/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in index 32ef9d91f70..ca869cb473d 100644 --- a/mozilla/gfx/tests/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/gfx/tests/coverage/Makefile.in b/mozilla/gfx/tests/coverage/Makefile.in index f6a7785c1c2..bf535dd2cc6 100644 --- a/mozilla/gfx/tests/coverage/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/htmlparser/robot/test/RobotMain.cpp b/mozilla/htmlparser/robot/test/RobotMain.cpp index 14c890bed0b..421a1f5a4a6 100644 --- a/mozilla/htmlparser/robot/test/RobotMain.cpp +++ b/mozilla/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 diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in index c3f7768361c..a3ad5a7441d 100644 --- a/mozilla/htmlparser/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/htmlparser/tests/logparse/Makefile.in b/mozilla/htmlparser/tests/logparse/Makefile.in index fac82ae3799..2300d8181f5 100644 --- a/mozilla/htmlparser/tests/logparse/Makefile.in +++ b/mozilla/htmlparser/tests/logparse/Makefile.in @@ -31,7 +31,7 @@ PROGRAM = logparse CPPSRCS = logparse.cpp LIBS = \ - -lraptorhtmlpars \ + -lhtmlpars \ $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/htmlparser/tests/logparse/logparse.cpp b/mozilla/htmlparser/tests/logparse/logparse.cpp index 4369bda3a2c..99a50bd292d 100644 --- a/mozilla/htmlparser/tests/logparse/logparse.cpp +++ b/mozilla/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 diff --git a/mozilla/htmlparser/tests/outsinks/Convert.cpp b/mozilla/htmlparser/tests/outsinks/Convert.cpp index d816612ff3f..eeb112a2df0 100644 --- a/mozilla/htmlparser/tests/outsinks/Convert.cpp +++ b/mozilla/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 diff --git a/mozilla/htmlparser/tests/outsinks/nsSetupRegistry.cpp b/mozilla/htmlparser/tests/outsinks/nsSetupRegistry.cpp index f27b89fc7fe..d5f93219f61 100644 --- a/mozilla/htmlparser/tests/outsinks/nsSetupRegistry.cpp +++ b/mozilla/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 diff --git a/mozilla/intl/strres/tests/StringBundleTest.cpp b/mozilla/intl/strres/tests/StringBundleTest.cpp index ebf81e61cb2..a9c83e93126 100644 --- a/mozilla/intl/strres/tests/StringBundleTest.cpp +++ b/mozilla/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 */ diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in index 9f89e634299..a07f4bd1a35 100644 --- a/mozilla/layout/base/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in index 7ac784f72f2..02fa8d08fa1 100644 --- a/mozilla/layout/base/tests/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index c97caa1bbaa..aca37e1dd84 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/events/src/Makefile.in b/mozilla/layout/events/src/Makefile.in index bdc0bc79cf1..80015999b35 100644 --- a/mozilla/layout/events/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index 03dcb74fd83..84d76f72e57 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/layout/html/content/src/Makefile.in b/mozilla/layout/html/content/src/Makefile.in index 91ba1c6231f..27213ece150 100644 --- a/mozilla/layout/html/content/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in index 04cc4f6299c..1c2df837da5 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index d7f914b4adf..29451c1cac0 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in index 40ca58153aa..f4a32b3cb5c 100644 --- a/mozilla/layout/html/style/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/layout/html/table/public/Makefile.in b/mozilla/layout/html/table/public/Makefile.in index 4c9f3945cdc..eb41d091963 100644 --- a/mozilla/layout/html/table/public/Makefile.in +++ b/mozilla/layout/html/table/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = layout EXPORTS = \ nsITableCellLayout.h \ diff --git a/mozilla/layout/html/table/src/Makefile.in b/mozilla/layout/html/table/src/Makefile.in index 35fe5791712..498863f2e3e 100644 --- a/mozilla/layout/html/table/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in index caa654e7c9c..ea11b580e77 100644 --- a/mozilla/layout/html/tests/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/layout/html/tests/TestCSSParser.cpp b/mozilla/layout/html/tests/TestCSSParser.cpp index d50c5acaae3..34fdc8e8e8e 100644 --- a/mozilla/layout/html/tests/TestCSSParser.cpp +++ b/mozilla/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 diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index c3cfdc6866f..ca371f3199f 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index f71e5387f43..9e6ae647d74 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in index 5e7d1e44580..3e75e3ec509 100644 --- a/mozilla/layout/svg/base/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/svg/content/src/Makefile.in b/mozilla/layout/svg/content/src/Makefile.in index 06fa7873981..6f062efa22d 100644 --- a/mozilla/layout/svg/content/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/xbl/src/Makefile.in b/mozilla/layout/xbl/src/Makefile.in index 0a7689c0b7d..16a59d6b4cc 100644 --- a/mozilla/layout/xbl/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/xml/content/src/Makefile.in b/mozilla/layout/xml/content/src/Makefile.in index 029997678b9..561133ef56f 100644 --- a/mozilla/layout/xml/content/src/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/layout/xml/document/src/Makefile.in b/mozilla/layout/xml/document/src/Makefile.in index f9405a891f2..50e77d8a526 100644 --- a/mozilla/layout/xml/document/src/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/layout/xsl/document/src/Makefile.in b/mozilla/layout/xsl/document/src/Makefile.in index 4735aea49fd..2c5d61ac286 100755 --- a/mozilla/layout/xsl/document/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index 8d2d33eb346..9311515f3f4 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/layout/xul/content/src/Makefile.in b/mozilla/layout/xul/content/src/Makefile.in index 6e982d1d804..bcddca0767a 100644 --- a/mozilla/layout/xul/content/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in index 293701541d2..eadb35f3f4c 100644 --- a/mozilla/mailnews/compose/tests/compose2/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in index dc5a70faba8..51468a954c4 100644 --- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 1b2ea32aef5..5ccd9829596 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in index 1b2ea32aef5..5ccd9829596 100644 --- a/mozilla/modules/plugin/nglsrc/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/parser/htmlparser/robot/test/RobotMain.cpp b/mozilla/parser/htmlparser/robot/test/RobotMain.cpp index 14c890bed0b..421a1f5a4a6 100644 --- a/mozilla/parser/htmlparser/robot/test/RobotMain.cpp +++ b/mozilla/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 diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index c3f7768361c..a3ad5a7441d 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/parser/htmlparser/tests/logparse/Makefile.in b/mozilla/parser/htmlparser/tests/logparse/Makefile.in index fac82ae3799..2300d8181f5 100644 --- a/mozilla/parser/htmlparser/tests/logparse/Makefile.in +++ b/mozilla/parser/htmlparser/tests/logparse/Makefile.in @@ -31,7 +31,7 @@ PROGRAM = logparse CPPSRCS = logparse.cpp LIBS = \ - -lraptorhtmlpars \ + -lhtmlpars \ $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/parser/htmlparser/tests/logparse/logparse.cpp b/mozilla/parser/htmlparser/tests/logparse/logparse.cpp index 4369bda3a2c..99a50bd292d 100644 --- a/mozilla/parser/htmlparser/tests/logparse/logparse.cpp +++ b/mozilla/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 diff --git a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp index d816612ff3f..eeb112a2df0 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp +++ b/mozilla/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 diff --git a/mozilla/parser/htmlparser/tests/outsinks/nsSetupRegistry.cpp b/mozilla/parser/htmlparser/tests/outsinks/nsSetupRegistry.cpp index f27b89fc7fe..d5f93219f61 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/nsSetupRegistry.cpp +++ b/mozilla/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 diff --git a/mozilla/rdf/brprof/server/nsBrowsingProfileReader.cpp b/mozilla/rdf/brprof/server/nsBrowsingProfileReader.cpp index 00dfcb85ef8..afa25e0fe3c 100644 --- a/mozilla/rdf/brprof/server/nsBrowsingProfileReader.cpp +++ b/mozilla/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) diff --git a/mozilla/rdf/tests/localfile/localfile.cpp b/mozilla/rdf/tests/localfile/localfile.cpp index 1d6716c1f6c..53eeefc73c6 100644 --- a/mozilla/rdf/tests/localfile/localfile.cpp +++ b/mozilla/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) diff --git a/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp b/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp index 83218210c5e..a80789779b7 100644 --- a/mozilla/rdf/tests/rdfpoll/rdfpoll.cpp +++ b/mozilla/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) diff --git a/mozilla/rdf/tests/rdfsink/rdfsink.cpp b/mozilla/rdf/tests/rdfsink/rdfsink.cpp index 86515c20fed..7d13ccc8d43 100644 --- a/mozilla/rdf/tests/rdfsink/rdfsink.cpp +++ b/mozilla/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) diff --git a/mozilla/view/public/Makefile.in b/mozilla/view/public/Makefile.in index e5c855d788b..8ca7bc76e72 100644 --- a/mozilla/view/public/Makefile.in +++ b/mozilla/view/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = view EXPORTS = \ nsIView.h \ diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in index 2478275cd1c..3e25fa4d32e 100644 --- a/mozilla/view/src/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/webshell/embed/xlib/gtk/Makefile.in b/mozilla/webshell/embed/xlib/gtk/Makefile.in index 13cfcd6f637..44676e2123d 100644 --- a/mozilla/webshell/embed/xlib/gtk/Makefile.in +++ b/mozilla/webshell/embed/xlib/gtk/Makefile.in @@ -34,7 +34,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lraptorgfx \ + -lgkgfx \ $(NETLIB_LIBS) \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ diff --git a/mozilla/webshell/embed/xlib/motif/Makefile.in b/mozilla/webshell/embed/xlib/motif/Makefile.in index 101ffb11b57..fcba29df771 100644 --- a/mozilla/webshell/embed/xlib/motif/Makefile.in +++ b/mozilla/webshell/embed/xlib/motif/Makefile.in @@ -36,7 +36,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lraptorgfx \ + -lgkgfx \ $(NETLIB_LIBS) \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ diff --git a/mozilla/webshell/embed/xlib/qt/Makefile.in b/mozilla/webshell/embed/xlib/qt/Makefile.in index 1b599169429..af9b968b8b6 100644 --- a/mozilla/webshell/embed/xlib/qt/Makefile.in +++ b/mozilla/webshell/embed/xlib/qt/Makefile.in @@ -43,7 +43,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lraptorgfx \ + -lgkgfx \ $(NETLIB_LIBS) \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ diff --git a/mozilla/webshell/embed/xlib/xt/Makefile.in b/mozilla/webshell/embed/xlib/xt/Makefile.in index f118799ee69..2b1c10ffddb 100644 --- a/mozilla/webshell/embed/xlib/xt/Makefile.in +++ b/mozilla/webshell/embed/xlib/xt/Makefile.in @@ -35,7 +35,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lraptorgfx \ + -lgkgfx \ $(NETLIB_LIBS) \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ diff --git a/mozilla/webshell/public/Makefile.in b/mozilla/webshell/public/Makefile.in index ff0529dcc5b..5ecc625f76a 100644 --- a/mozilla/webshell/public/Makefile.in +++ b/mozilla/webshell/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = webshell EXPORTS = \ nsIClipboardCommands.h \ diff --git a/mozilla/webshell/src/Makefile.in b/mozilla/webshell/src/Makefile.in index d62ba358ab9..73bb715377c 100644 --- a/mozilla/webshell/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 8a3fad5e7e4..71724391600 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp index 6d4e82eca8e..84465b5b97b 100644 --- a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp +++ b/mozilla/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 diff --git a/mozilla/widget/public/Makefile.in b/mozilla/widget/public/Makefile.in index b6624fff8a9..f09a55a99f3 100644 --- a/mozilla/widget/public/Makefile.in +++ b/mozilla/widget/public/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = widget XPIDL_MODULE = widget EXPORTS = \ diff --git a/mozilla/widget/src/beos/Makefile.in b/mozilla/widget/src/beos/Makefile.in index 524043474b5..9684ebfa9e4 100644 --- a/mozilla/widget/src/beos/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in index 677f68fee35..c20357bf9dd 100644 --- a/mozilla/widget/src/build/Makefile.in +++ b/mozilla/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 = \ diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in index 896275e9d3b..378651115b1 100644 --- a/mozilla/widget/src/gtk/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/widget/src/mac/Makefile.in b/mozilla/widget/src/mac/Makefile.in index 9ae5da27481..153fe1255aa 100644 --- a/mozilla/widget/src/mac/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/widget/src/motif/Makefile.in b/mozilla/widget/src/motif/Makefile.in index 3bd7b4ba285..d5ae8d377a9 100644 --- a/mozilla/widget/src/motif/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/widget/src/os2/Makefile.in b/mozilla/widget/src/os2/Makefile.in index 741dd7f4ef7..62c0c35fa94 100644 --- a/mozilla/widget/src/os2/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/widget/src/os2/tests/Makefile.in b/mozilla/widget/src/os2/tests/Makefile.in index 343dd849e57..fa2dbd397c7 100644 --- a/mozilla/widget/src/os2/tests/Makefile.in +++ b/mozilla/widget/src/os2/tests/Makefile.in @@ -23,7 +23,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE = widget SIMPLE_PROGRAMS = dirpicker$(BIN_SUFFIX) diff --git a/mozilla/widget/src/photon/Makefile.in b/mozilla/widget/src/photon/Makefile.in index 38cd0873544..68c6762b63a 100644 --- a/mozilla/widget/src/photon/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/widget/src/qt/Makefile.in b/mozilla/widget/src/qt/Makefile.in index b05cdf60bbd..27318eede2b 100644 --- a/mozilla/widget/src/qt/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/widget/src/xlib/Makefile.in b/mozilla/widget/src/xlib/Makefile.in index 0b314881dff..f0b4b4dda80 100644 --- a/mozilla/widget/src/xlib/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index 7516e49fbd6..8b972573478 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in index 25653bd54d3..ff52311a8b1 100644 --- a/mozilla/widget/tests/scribble/Makefile.in +++ b/mozilla/widget/tests/scribble/Makefile.in @@ -37,7 +37,7 @@ LIBS = \ $(MOZ_WIDGET_SUPPORT_LIBS) \ $(XPCOM_LIBS) \ $(MOZ_JS_LIBS) \ - -lraptorgfx \ + -lgkgfx \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index a80f8399a72..fab80f45311 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/widget/tests/widget/Makefile.in @@ -37,7 +37,7 @@ LIBS = \ $(MOZ_WIDGET_SUPPORT_LIBS) \ $(XPCOM_LIBS) \ $(MOZ_JS_LIBS) \ - -lraptorgfx \ + -lgkgfx \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index d3a44e6b4d9..545d70a53aa 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 27e6532e12e..c412cc1d104 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -34,8 +34,8 @@ EXTRA_DSO_LIBS = nggfx WEBSHELL_LIB = $(DIST)/lib/webshell.$(LIB_SUFFIX) else PROGRAM = mozilla-bin -EXTRA_DSO_LIBS = raptorgfx -WEBSHELL_LIB = -lraptorwebwidget +EXTRA_DSO_LIBS = gkgfx +WEBSHELL_LIB = -lwebshell endif CPPSRCS = \ diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix index 68ecad53f4f..28a2b6c0721 100644 --- a/mozilla/xpinstall/packager/packages-unix +++ b/mozilla/xpinstall/packager/packages-unix @@ -45,9 +45,9 @@ bin/libjpeg.so bin/libjsj.so bin/libmsgbaseutil.so bin/libprotocol.so -bin/libraptorgfx.so -bin/libraptorplugin.so -bin/libraptorwebwidget.so +bin/libgkgfx.so +bin/libgkplugin.so +bin/libwebshell.so bin/run-mozilla.sh bin/regExport bin/regxpcom @@ -91,9 +91,9 @@ bin/components/liboji.so bin/components/libpsmglue.so bin/components/libpref.so bin/components/libprofile.so -bin/components/libraptorhtml.so -bin/components/libraptorhtmlpars.so -bin/components/libraptorview.so +bin/components/libgklayout.so +bin/components/libhtmlpars.so +bin/components/libgkview.so bin/components/librdf.so bin/components/librelated.so bin/components/libshistory.so