Remove gfx2 from REQUIRES globally, since we no longer export headers to a separate gfx2 module. r=cls.

2002-10-05 02:49:02 +00:00 · 2002-10-05 02:49:02 +00:00 · c4d52841f0
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@ -35,7 +35,6 @@ REQUIRES = \
  dom \
  editor \
  gfx \
-  gfx2 \
  htmlparser \
  imglib2 \
  intl \
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -53,7 +53,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  windowwatcher \
 		  imglib2 \
-		  gfx2 \
 		  uriloader \
 		  webbrwsr \
 		  debug \
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -48,7 +48,6 @@ REQUIRES	= xpcom \
 		  xuldoc \
 		  caps \
 		  editor \
-		  gfx2 \
 		  imglib2 \
 		  mimetype \
 		  exthandler \
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -53,7 +53,6 @@ REQUIRES	= xpcom \
 		  nkcache \
 		  appcomps \
 		  lwbrk \
-		  gfx2 \
 		  imglib2 \
 		  xpconnect \
 		  unicharutil \
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@ -53,7 +53,6 @@ REQUIRES	= xpcom \
 		  chrome \
 		  mimetype \
 		  imglib2 \
-		  gfx2 \
 		  webbrwsr \
 		  unicharutil \
 		  commandhandler \
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  webbrowserpersist \
 		  unicharutil \
 		  imglib2 \
-		  gfx2 \
 		  locale \
 		  $(NULL)

--- a/embedding/tests/mfcembed/Makefile.in
+++ b/embedding/tests/mfcembed/Makefile.in
@ -60,7 +60,6 @@ REQUIRES = \
 	composer \
 	commandhandler \
 	imglib2 \
-	gfx2 \
 	webbrwsr \
 	$(NULL)

--- a/extensions/inspector/base/src/Makefile.in
+++ b/extensions/inspector/base/src/Makefile.in
@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  content \
 		  widget \
 		  locale \
-		  gfx2 \
 		  necko \
 		  docshell \
 		  view \
--- a/extensions/inspector/build/src/Makefile.in
+++ b/extensions/inspector/build/src/Makefile.in
@ -42,7 +42,6 @@ REQUIRES	= xpcom \
 		  dom \
 		  widget \
 		  locale \
-		  gfx2 \
 		  necko \
 		  imglib2 \
 		  $(NULL)
--- a/extensions/layout-debug/plugin/Makefile.in
+++ b/extensions/layout-debug/plugin/Makefile.in
@ -39,7 +39,6 @@ REQUIRES=   xpcom \
            locale \
            view \
            pref \
-            gfx2 \
            imglib2 \
            unicharutil \
            java \
--- a/extensions/layout-debug/src/Makefile.in
+++ b/extensions/layout-debug/src/Makefile.in
@ -47,7 +47,6 @@ REQUIRES=	xpcom \
 					locale \
 					view \
 					pref \
-					gfx2 \
 					imglib2 \
 					unicharutil \
 					$(NULL)
--- a/extensions/wallet/cookieviewer/Makefile.in
+++ b/extensions/wallet/cookieviewer/Makefile.in
@ -1,55 +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
-
-MODULE		= walletviewers
-LIBRARY_NAME	= cookieviewer_s
-XPIDL_MODULE	= cookieviewer
-REQUIRES	= xpcom \
-		  string \
-		  dom \
-		  js \
-		  gfx \
-		  layout \
-		  content \
-		  widget \
-		  cookie \
-		  docshell \
-		  uriloader \
-		  locale \
-		  necko \
-		  gfx2 \
-		  $(NULL)
-
-CPPSRCS		= nsCookieViewer.cpp
-
-XPIDLSRCS	= nsICookieViewer.idl
-
-# we don't want the shared lib, but we want to force the creation of a static lib
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  view \
 		  pref \
-		  gfx2 \
 		  imglib2 \
 		  unicharutil \
 		  $(NULL)
--- a/gfx/src/mac/Makefile.in
+++ b/gfx/src/mac/Makefile.in
@ -40,7 +40,6 @@ REQUIRES    = xpcom \
        uconv \
        necko \
        unicharutil \
-        gfx2 \
        mozcomps \
        content \
        layout \
--- a/gfx/src/ps/Makefile.in
+++ b/gfx/src/ps/Makefile.in
@ -38,7 +38,6 @@ REQUIRES	= xpcom \
 		  pref \
 		  uconv \
 		  view \
-		  gfx2 \
 		  necko \
 		  imglib2 \
 		  $(NULL)
--- a/gfx/src/qt/Makefile.in
+++ b/gfx/src/qt/Makefile.in
@ -34,7 +34,6 @@ REQUIRES	= xpcom \
 		  string \
 		  widget \
 		  view \
-		  gfx2 \
 		  uconv \
 		  pref \
 		  util \
--- a/gfx/src/xlib/Makefile.in
+++ b/gfx/src/xlib/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  uconv \
 		  locale \
 		  unicharutil \
-		  gfx2 \
 		  imglib2 \
 		  mozcomps \
 		  intl \
--- a/gfx/src/xprint/Makefile.in
+++ b/gfx/src/xprint/Makefile.in
@ -43,7 +43,6 @@ REQUIRES	= xpcom \
 		  locale \
 		  uconv \
 		  unicharutil \
-		  gfx2 \
 		  imglib2 \
 		  $(NULL)

--- a/layout/base/src/Makefile.in
+++ b/layout/base/src/Makefile.in
@ -44,7 +44,6 @@ REQUIRES	= xpcom \
 		  uriloader \
 		  docshell \
 		  imglib2 \
-		  gfx2 \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/html/base/src/Makefile.in
+++ b/layout/html/base/src/Makefile.in
@ -51,7 +51,6 @@ REQUIRES	= xpcom \
 		  util \
 		  unicharutil \
 		  lwbrk \
-		  gfx2 \
 		  imglib2 \
 		  accessibility \
 		  xpconnect \
--- a/layout/html/forms/src/Makefile.in
+++ b/layout/html/forms/src/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  uconv \
 		  txmgr \
 		  xuldoc \
-		  gfx2 \
 		  imglib2 \
 		  accessibility \
 		  xpconnect \
--- a/layout/html/style/src/Makefile.in
+++ b/layout/html/style/src/Makefile.in
@ -43,7 +43,6 @@ REQUIRES	= xpcom \
 		  plugin \
 		  xuldoc \
 		  imglib2 \
-		  gfx2 \
 		  $(NULL)

 CPPSRCS		= \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -46,7 +46,6 @@ REQUIRES	= xpcom \
 		  webshell \
 		  pref \
 		  intl \
-		  gfx2 \
 		  imglib2 \
 		  unicharutil \
 		  xpconnect \
--- a/layout/xul/base/src/tree/src/Makefile.in
+++ b/layout/xul/base/src/tree/src/Makefile.in
@ -39,7 +39,6 @@ REQUIRES	= xpcom \
 		  xultmpl \
 		  rdf \
 		  necko \
-		  gfx2 \
 		  imglib2 \
 		  xpconnect \
 		  js \
--- a/modules/libpr0n/build/Makefile.in
+++ b/modules/libpr0n/build/Makefile.in
@ -37,7 +37,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  nkcache \
 		  gfx \
-		  gfx2 \
 		  $(JPEG_REQUIRES) \
 		  $(PNG_REQUIRES) \
 		  $(ZLIB_REQUIRES) \
--- a/modules/libpr0n/decoders/bmp/Makefile.in
+++ b/modules/libpr0n/decoders/bmp/Makefile.in
@ -35,7 +35,6 @@ MODULE_NAME	= nsBMPModule

 REQUIRES	= xpcom \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  string \
 		  $(NULL)
--- a/modules/libpr0n/decoders/gif/Makefile.in
+++ b/modules/libpr0n/decoders/gif/Makefile.in
@ -34,7 +34,6 @@ MODULE_NAME	= nsGIFModule2

 REQUIRES	= xpcom \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  $(NULL)

--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@ -46,7 +46,6 @@ DIRS		= $(PLATFORM)
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  necko \
 		  $(NULL)
--- a/modules/libpr0n/decoders/jpeg/Makefile.in
+++ b/modules/libpr0n/decoders/jpeg/Makefile.in
@ -36,7 +36,6 @@ MODULE_NAME	= nsJPEGDecoderModule
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  $(JPEG_REQUIRES) \
 		  $(NULL)
--- a/modules/libpr0n/decoders/mng/Makefile.in
+++ b/modules/libpr0n/decoders/mng/Makefile.in
@ -34,7 +34,6 @@ EXTRA_DSO_LIBS	= gkgfx

 REQUIRES	= xpcom \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  $(MNG_REQUIRES) \
 		  $(JPEG_REQUIRES) \
--- a/modules/libpr0n/decoders/png/Makefile.in
+++ b/modules/libpr0n/decoders/png/Makefile.in
@ -36,7 +36,6 @@ EXTRA_DSO_LIBS	= gkgfx

 REQUIRES	= xpcom \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  $(PNG_REQUIRES) \
 		  $(ZLIB_REQUIRES) \
--- a/modules/libpr0n/decoders/ppm/Makefile.in
+++ b/modules/libpr0n/decoders/ppm/Makefile.in
@ -35,7 +35,6 @@ MODULE_NAME	= nsPPMDecoderModule

 REQUIRES	= xpcom \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  $(NULL)

--- a/modules/libpr0n/decoders/xbm/Makefile.in
+++ b/modules/libpr0n/decoders/xbm/Makefile.in
@ -35,7 +35,6 @@ MODULE_NAME     = nsXBMModule

 REQUIRES	= xpcom \
 		  gfx \
-		  gfx2 \
 		  imglib2 \
 		  string \
 		  $(NULL)
--- a/modules/libpr0n/src/Makefile.in
+++ b/modules/libpr0n/src/Makefile.in
@ -37,7 +37,6 @@ REQUIRES	= xpcom \
 		  necko \
 		  nkcache \
 		  gfx \
-		  gfx2 \
 		  $(NULL)

 CPPSRCS		= \
--- a/webshell/tests/viewer/unix/qt/Makefile.in
+++ b/webshell/tests/viewer/unix/qt/Makefile.in
@ -38,7 +38,6 @@ REQUIRES	= xpcom \
 		  layout \
 		  content \
 		  uriloader \
-		  gfx2 \
 		  webbrwsr \
 		  webshell \
 		  locale \
--- a/webshell/tests/viewer/unix/xlib/Makefile.in
+++ b/webshell/tests/viewer/unix/xlib/Makefile.in
@ -45,7 +45,6 @@ REQUIRES	= xpcom \
 		  docshell \
 		  util \
 		  locale \
-		  gfx2 \
 		  $(NULL)

 CPPSRCS		= nsXlibMain.cpp
--- a/widget/src/qt/Makefile.in
+++ b/widget/src/qt/Makefile.in
@ -36,7 +36,6 @@ REQUIRES	= xpcom \
 		  layout \
 		  content \
 		  dom \
-		  gfx2 \
 		  appshell \
 		  pref \
 		  uconv \
--- a/widget/src/xlib/Makefile.in
+++ b/widget/src/xlib/Makefile.in
@ -47,7 +47,6 @@ REQUIRES	= xpcom \
 		  htmlparser \
 		  view \
 		  necko \
-		  gfx2 \
 		  $(NULL)

 CPPSRCS		= \
--- a/xpfe/components/winhooks/Makefile.in
+++ b/xpfe/components/winhooks/Makefile.in
@ -47,7 +47,6 @@ REQUIRES	= \
 		  widget \
 		  imglib2 \
 		  gfx \
-		  gfx2 \
 		  locale \
 		  $(NULL)