From 9e9173c4664a304fc1dcdbc359d02ea232a68e79 Mon Sep 17 00:00:00 2001 From: "mozilla@weilbacher.org" Date: Mon, 28 Jan 2008 15:07:34 -0800 Subject: [PATCH] Bug 412582: remove MOZ_ENABLE_CAIRO_GFX from the build system, r=ted.mielczarek, a=beltzner --- browser/app/Makefile.in | 7 +- config/autoconf.mk.in | 1 - configure.in | 227 ++++++++++++++---------------- content/canvas/src/Makefile.in | 12 +- layout/build/Makefile.in | 20 +-- layout/generic/Makefile.in | 6 +- modules/libpr0n/build/Makefile.in | 5 +- modules/staticmod/Makefile.in | 2 - toolkit/library/libxul-config.mk | 19 --- toolkit/library/libxul-rules.mk | 2 - view/src/Makefile.in | 8 +- widget/src/build/Makefile.in | 8 +- 12 files changed, 116 insertions(+), 201 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 9947fc0cb56..22a9fda2803 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -130,10 +130,7 @@ LIBS += \ # Add explicit X11 dependency when building against X11 toolkits ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) -LIBS += $(XLDFLAGS) $(XLIBS) -ifdef MOZ_ENABLE_CAIRO_GFX -LIBS += $(ZLIB_LIBS) -endif +LIBS += $(XLDFLAGS) $(XLIBS) $(ZLIB_LIBS) endif ifdef MOZ_JPROF @@ -182,12 +179,10 @@ endif ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool) -ifdef MOZ_ENABLE_CAIRO_GFX OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32) ifdef MOZ_ENABLE_GLITZ OS_LIBS += $(call EXPAND_LIBNAME,opengl32) endif -endif RCINCLUDE = splash.rc ifndef GNU_CC diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 011b5b29f00..b6bffe15419 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -467,7 +467,6 @@ MOZ_TOOLKIT_REGISTRY_CFLAGS = \ CAIRO_FT_CFLAGS = @CAIRO_FT_CFLAGS@ -MOZ_ENABLE_CAIRO_GFX = @MOZ_ENABLE_CAIRO_GFX@ MOZ_ENABLE_CAIRO_FT = @MOZ_ENABLE_CAIRO_FT@ MOZ_ENABLE_GLITZ = @MOZ_ENABLE_GLITZ@ MOZ_ENABLE_GTK2 = @MOZ_ENABLE_GTK2@ diff --git a/configure.in b/configure.in index 11e6328643a..30669f53b86 100644 --- a/configure.in +++ b/configure.in @@ -4541,13 +4541,11 @@ photon) cairo-windows) MOZ_WIDGET_TOOLKIT=windows MOZ_GFX_TOOLKIT=cairo - MOZ_ENABLE_CAIRO_GFX=1 ;; cairo-gtk2) MOZ_WIDGET_TOOLKIT=gtk2 MOZ_GFX_TOOLKIT=cairo - MOZ_ENABLE_CAIRO_GFX=1 MOZ_ENABLE_GTK2=1 MOZ_ENABLE_XREMOTE=1 TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' @@ -4557,7 +4555,6 @@ cairo-gtk2) cairo-beos) MOZ_WIDGET_TOOLKIT=beos MOZ_GFX_TOOLKIT=cairo - MOZ_ENABLE_CAIRO_GFX=1 TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)' TK_LIBS='$(MOZ_CAIRO_LIBS)' ;; @@ -4565,7 +4562,6 @@ cairo-beos) cairo-os2) MOZ_WIDGET_TOOLKIT=os2 MOZ_GFX_TOOLKIT=cairo - MOZ_ENABLE_CAIRO_GFX=1 TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)' TK_LIBS='$(MOZ_CAIRO_LIBS)' ;; @@ -4578,7 +4574,6 @@ cairo-mac|cairo-cocoa) else MOZ_WIDGET_TOOLKIT=mac fi - MOZ_ENABLE_CAIRO_GFX=1 MOZ_GFX_TOOLKIT=cairo MOZ_USER_DIR="Mozilla" AC_DEFINE(XP_MACOSX) @@ -4646,7 +4641,6 @@ AC_SUBST(TK_LIBS) AC_SUBST(MOZ_ENABLE_GTK2) AC_SUBST(MOZ_ENABLE_PHOTON) AC_SUBST(MOZ_ENABLE_COCOA) -AC_SUBST(MOZ_ENABLE_CAIRO_GFX) AC_SUBST(MOZ_ENABLE_GLITZ) AC_SUBST(MOZ_ENABLE_XREMOTE) AC_SUBST(MOZ_GTK2_CFLAGS) @@ -4654,11 +4648,8 @@ AC_SUBST(MOZ_GTK2_LIBS) AC_SUBST(MOC) -if test "$MOZ_ENABLE_CAIRO_GFX" -then - AC_DEFINE(MOZ_THEBES) - AC_DEFINE(MOZ_CAIRO_GFX) -fi +AC_DEFINE(MOZ_THEBES) +AC_DEFINE(MOZ_CAIRO_GFX) if test "$MOZ_ENABLE_GTK2" then @@ -5526,14 +5517,10 @@ MOZ_ARG_DISABLE_BOOL(svg, MOZ_SVG=, MOZ_SVG=1 ) if test -n "$MOZ_SVG"; then - if test -z "$MOZ_ENABLE_CAIRO_GFX"; then - AC_MSG_ERROR([SVG requires cairo gfx]) - else - AC_DEFINE(MOZ_SVG) - fi + AC_DEFINE(MOZ_SVG) fi -MOZ_SVG_FOREIGNOBJECT=$MOZ_ENABLE_CAIRO_GFX +MOZ_SVG_FOREIGNOBJECT=1 dnl ======================================================== dnl SVG dnl ======================================================== @@ -5543,14 +5530,10 @@ MOZ_ARG_DISABLE_BOOL(svg-foreignobject, MOZ_SVG_FOREIGNOBJECT=, MOZ_SVG_FOREIGNOBJECT=1 ) if test "$MOZ_SVG_FOREIGNOBJECT"; then - if test -z "$MOZ_ENABLE_CAIRO_GFX"; then - AC_MSG_ERROR([ requires cairo gfx]) + if test "$MOZ_SVG"; then + AC_DEFINE(MOZ_SVG_FOREIGNOBJECT) else - if test "$MOZ_SVG"; then - AC_DEFINE(MOZ_SVG_FOREIGNOBJECT) - else - MOZ_SVG_FOREIGNOBEJCT= - fi + MOZ_SVG_FOREIGNOBEJCT= fi fi @@ -6890,115 +6873,113 @@ AC_SUBST(MOZ_LIBART_LIBS) dnl ======================================================== dnl Check for cairo dnl ======================================================== -if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then - MOZ_CAIRO_CFLAGS='-I$(LIBXUL_DIST)/include/cairo' +MOZ_CAIRO_CFLAGS='-I$(LIBXUL_DIST)/include/cairo' - MOZ_TREE_CAIRO=1 - MOZ_ARG_ENABLE_BOOL(system-cairo, - [ --enable-system-cairo Use system cairo (located with pkgconfig)], - MOZ_TREE_CAIRO=, - MOZ_TREE_CAIRO=1 ) +MOZ_TREE_CAIRO=1 +MOZ_ARG_ENABLE_BOOL(system-cairo, +[ --enable-system-cairo Use system cairo (located with pkgconfig)], +MOZ_TREE_CAIRO=, +MOZ_TREE_CAIRO=1 ) - # Check for headers defining standard int types. - AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h) +# Check for headers defining standard int types. +AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h) - if test "$MOZ_TREE_CAIRO"; then - # For now we assume that we will have a uint64_t available through - # one of the above headers or mozstdint.h. - AC_DEFINE(HAVE_UINT64_T) +if test "$MOZ_TREE_CAIRO"; then + # For now we assume that we will have a uint64_t available through + # one of the above headers or mozstdint.h. + AC_DEFINE(HAVE_UINT64_T) - # Define macros for cairo-features.h - if test "$MOZ_X11"; then - XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1" - XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1" - PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" - PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" - FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" - MOZ_ENABLE_CAIRO_FT=1 - CAIRO_FT_CFLAGS="$FT2_CFLAGS" - fi - if test "$MOZ_WIDGET_TOOLKIT" = "mac" -o "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then - QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1" - ATSUI_FONT_FEATURE="#define CAIRO_HAS_ATSUI_FONT 1" - fi - if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then - WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1" - WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1" - PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" - fi - if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then - OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1" - FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" - PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" - MOZ_ENABLE_CAIRO_FT=1 - CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include" - CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg" - fi - if test "$MOZ_ENABLE_GLITZ"; then - GLITZ_SURFACE_FEATURE="#define CAIRO_HAS_GLITZ_SURFACE 1" - fi - if test "$MOZ_WIDGET_TOOLKIT" = "beos"; then - PKG_CHECK_MODULES(CAIRO_FT, fontconfig freetype2) - BEOS_SURFACE_FEATURE="#define CAIRO_HAS_BEOS_SURFACE 1" - FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" - MOZ_ENABLE_CAIRO_FT=1 - fi - AC_SUBST(MOZ_ENABLE_CAIRO_FT) - AC_SUBST(CAIRO_FT_CFLAGS) + # Define macros for cairo-features.h + if test "$MOZ_X11"; then + XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1" + XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1" + PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" + PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" + FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" + MOZ_ENABLE_CAIRO_FT=1 + CAIRO_FT_CFLAGS="$FT2_CFLAGS" + fi + if test "$MOZ_WIDGET_TOOLKIT" = "mac" -o "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then + QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1" + ATSUI_FONT_FEATURE="#define CAIRO_HAS_ATSUI_FONT 1" + fi + if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then + WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1" + WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1" + PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" + fi + if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then + OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1" + FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" + PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" + MOZ_ENABLE_CAIRO_FT=1 + CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include" + CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg" + fi + if test "$MOZ_ENABLE_GLITZ"; then + GLITZ_SURFACE_FEATURE="#define CAIRO_HAS_GLITZ_SURFACE 1" + fi + if test "$MOZ_WIDGET_TOOLKIT" = "beos"; then + PKG_CHECK_MODULES(CAIRO_FT, fontconfig freetype2) + BEOS_SURFACE_FEATURE="#define CAIRO_HAS_BEOS_SURFACE 1" + FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" + MOZ_ENABLE_CAIRO_FT=1 + fi + AC_SUBST(MOZ_ENABLE_CAIRO_FT) + AC_SUBST(CAIRO_FT_CFLAGS) - if test "$MOZ_DEBUG"; then - SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1" - else - SANITY_CHECKING_FEATURE="#undef CAIRO_DO_SANITY_CHECKING" - fi + if test "$MOZ_DEBUG"; then + SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1" + else + SANITY_CHECKING_FEATURE="#undef CAIRO_DO_SANITY_CHECKING" + fi - PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1" + PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1" - AC_SUBST(PS_SURFACE_FEATURE) - AC_SUBST(PDF_SURFACE_FEATURE) - AC_SUBST(SVG_SURFACE_FEATURE) - AC_SUBST(XLIB_SURFACE_FEATURE) - AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE) - AC_SUBST(QUARTZ_SURFACE_FEATURE) - AC_SUBST(NQUARTZ_SURFACE_FEATURE) - AC_SUBST(XCB_SURFACE_FEATURE) - AC_SUBST(WIN32_SURFACE_FEATURE) - AC_SUBST(OS2_SURFACE_FEATURE) - AC_SUBST(BEOS_SURFACE_FEATURE) - AC_SUBST(GLITZ_SURFACE_FEATURE) - AC_SUBST(DIRECTFB_SURFACE_FEATURE) - AC_SUBST(FT_FONT_FEATURE) - AC_SUBST(WIN32_FONT_FEATURE) - AC_SUBST(ATSUI_FONT_FEATURE) - AC_SUBST(PNG_FUNCTIONS_FEATURE) + AC_SUBST(PS_SURFACE_FEATURE) + AC_SUBST(PDF_SURFACE_FEATURE) + AC_SUBST(SVG_SURFACE_FEATURE) + AC_SUBST(XLIB_SURFACE_FEATURE) + AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE) + AC_SUBST(QUARTZ_SURFACE_FEATURE) + AC_SUBST(NQUARTZ_SURFACE_FEATURE) + AC_SUBST(XCB_SURFACE_FEATURE) + AC_SUBST(WIN32_SURFACE_FEATURE) + AC_SUBST(OS2_SURFACE_FEATURE) + AC_SUBST(BEOS_SURFACE_FEATURE) + AC_SUBST(GLITZ_SURFACE_FEATURE) + AC_SUBST(DIRECTFB_SURFACE_FEATURE) + AC_SUBST(FT_FONT_FEATURE) + AC_SUBST(WIN32_FONT_FEATURE) + AC_SUBST(ATSUI_FONT_FEATURE) + AC_SUBST(PNG_FUNCTIONS_FEATURE) - if test "$_WIN32_MSVC"; then - MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/mozcairo.lib $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib' - if test "$MOZ_ENABLE_GLITZ"; then - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'$(DEPTH)/gfx/cairo/glitz/src/mozglitz.lib $(DEPTH)/gfx/cairo/glitz/src/wgl/mozglitzwgl.lib' - fi - else - MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) $(DEPTH)/gfx/cairo/libpixman/src/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX)'" $CAIRO_FT_LIBS" + if test "$_WIN32_MSVC"; then + MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/mozcairo.lib $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib' + if test "$MOZ_ENABLE_GLITZ"; then + MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'$(DEPTH)/gfx/cairo/glitz/src/mozglitz.lib $(DEPTH)/gfx/cairo/glitz/src/wgl/mozglitzwgl.lib' + fi + else + MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) $(DEPTH)/gfx/cairo/libpixman/src/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX)'" $CAIRO_FT_LIBS" - if test "$MOZ_X11"; then - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig" - fi + if test "$MOZ_X11"; then + MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig" + fi - if test "$MOZ_ENABLE_GLITZ"; then - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src -lmozglitz' - if test "$MOZ_X11"; then - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/glx -lmozglitzglx -lGL' - fi - if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then - MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/wgl -lmozglitzwgl' - fi - fi - fi - else - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig) - MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS - MOZ_CAIRO_LIBS=$CAIRO_LIBS - fi + if test "$MOZ_ENABLE_GLITZ"; then + MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src -lmozglitz' + if test "$MOZ_X11"; then + MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/glx -lmozglitzglx -lGL' + fi + if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then + MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/wgl -lmozglitzwgl' + fi + fi + fi +else + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig) + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS fi AC_SUBST(MOZ_TREE_CAIRO) diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index ebf7b2a8a53..f77a8d907ed 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -75,12 +75,9 @@ REQUIRES = \ plugin \ cairo \ libpixman \ + thebes \ $(NULL) -ifdef MOZ_ENABLE_CAIRO_GFX -REQUIRES += thebes -endif - # XXX some platforms can't handle building # an empty .a/lib. Remove this dummy.cpp # whenever w have a rendering context @@ -100,11 +97,4 @@ include $(topsrcdir)/config/rules.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) -ifndef MOZ_ENABLE_CAIRO_GFX -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -# needed for nsDrawingSurfaceMac.h -CXXFLAGS += -I$(topsrcdir)/gfx/src/mac -endif -endif - DEFINES += -D_IMPL_NS_LAYOUT diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index fecad7d6d72..37d644b09a7 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -64,9 +64,7 @@ PACKAGE_VARS += MOZ_XUL ifndef MOZ_ENABLE_LIBXUL EXTRA_DSO_LIBS = gkgfx endif -ifdef MOZ_ENABLE_CAIRO_GFX EXTRA_DSO_LIBS += thebes -endif REQUIRES = xpcom \ string \ @@ -100,12 +98,9 @@ REQUIRES = xpcom \ webbrwsr \ uconv \ txtsvc \ + thebes \ $(NULL) -ifdef MOZ_ENABLE_CAIRO_GFX -REQUIRES += thebes -endif - CPPSRCS = \ nsLayoutModule.cpp \ nsContentDLF.cpp \ @@ -227,21 +222,10 @@ ifdef NS_TRACE_MALLOC EXTRA_DSO_LIBS += tracemalloc endif -ifdef MOZ_ENABLE_CAIRO_GFX -EXTRA_DSO_LIBS += thebes -else -ifdef MOZ_ENABLE_CANVAS -EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) -endif -endif - ifdef MOZ_ENABLE_GTK2 EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \ + -lXrender \ $(NULL) -ifdef MOZ_ENABLE_CAIRO_GFX -EXTRA_DSO_LDOPTS += -lXrender \ - $(NULL) -endif endif ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index c6cc53caee7..d3d2d04fe87 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -80,6 +80,8 @@ REQUIRES = xpcom \ exthandler \ intl \ uconv \ + thebes \ + cairo \ $(NULL) # Sun's Complex Text Layout support @@ -87,10 +89,6 @@ ifdef SUNCTL REQUIRES += ctl endif -ifdef MOZ_ENABLE_CAIRO_GFX -REQUIRES += thebes cairo -endif - EXPORTS = \ nsFrameList.h \ nsHTMLParts.h \ diff --git a/modules/libpr0n/build/Makefile.in b/modules/libpr0n/build/Makefile.in index eec0fcf5ccd..1d9eede89ac 100644 --- a/modules/libpr0n/build/Makefile.in +++ b/modules/libpr0n/build/Makefile.in @@ -90,12 +90,9 @@ SHARED_LIBRARY_LIBS = \ EXTRA_DSO_LIBS = \ gkgfx \ + thebes \ $(NULL) -ifdef MOZ_ENABLE_CAIRO_GFX -EXTRA_DSO_LIBS += thebes -endif - EXTRA_DSO_LDOPTS = \ $(LIBS_DIR) \ $(JPEG_LIBS) \ diff --git a/modules/staticmod/Makefile.in b/modules/staticmod/Makefile.in index 39c84a38090..42a2a442997 100644 --- a/modules/staticmod/Makefile.in +++ b/modules/staticmod/Makefile.in @@ -86,10 +86,8 @@ OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 v ifdef GNU_CC OS_LIBS += $(call EXPAND_LIBNAME,winmm wsock32 gdi32) endif -ifdef MOZ_ENABLE_CAIRO_GFX OS_LIBS += $(call EXPAND_LIBNAME, usp10) endif -endif ifneq (,$(MOZ_ENABLE_GTK2)) OS_LIBS += $(XLDFLAGS) $(XT_LIBS) diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk index 66b55599a1d..d7ee2794648 100644 --- a/toolkit/library/libxul-config.mk +++ b/toolkit/library/libxul-config.mk @@ -283,28 +283,9 @@ COMPONENT_LIBS += imgicon endif endif -ifdef MOZ_ENABLE_CAIRO_GFX STATIC_LIBS += thebes COMPONENT_LIBS += gkgfxthebes -else # Platform-specific GFX layer - ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) - COMPONENT_LIBS += gkgfxwin - endif - ifeq (beos,$(MOZ_WIDGET_TOOLKIT)) - COMPONENT_LIBS += gfx_beos - endif - ifeq (os2,$(MOZ_WIDGET_TOOLKIT)) - COMPONENT_LIBS += gfx_os2 - endif - ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) - COMPONENT_LIBS += gfx_mac - endif - ifdef MOZ_ENABLE_PHOTON - COMPONENT_LIBS += gfx_photon - endif -endif - ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) COMPONENT_LIBS += gkwidget endif diff --git a/toolkit/library/libxul-rules.mk b/toolkit/library/libxul-rules.mk index 80227eabf75..4bfe50fd6ba 100644 --- a/toolkit/library/libxul-rules.mk +++ b/toolkit/library/libxul-rules.mk @@ -69,7 +69,6 @@ DEFINES += \ -D_IMPL_NS_WIDGET \ $(NULL) -ifdef MOZ_ENABLE_CAIRO_GFX ifeq ($(MOZ_WIDGET_TOOLKIT),windows) OS_LIBS += $(call EXPAND_LIBNAME,usp10) endif @@ -79,7 +78,6 @@ ifdef MOZ_ENABLE_GLITZ EXTRA_DSO_LDOPTS += -lmozglitzagl -framework OpenGL -framework AGL endif endif -endif # MOZ_ENABLE_CAIRO_GFX ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) diff --git a/view/src/Makefile.in b/view/src/Makefile.in index 9566f17b0de..a9a78e64c36 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -55,12 +55,10 @@ REQUIRES = xpcom \ widget \ dom \ pref \ + thebes \ + cairo \ $(NULL) -ifdef MOZ_ENABLE_CAIRO_GFX -REQUIRES += thebes cairo -endif - EXTRA_DSO_LIBS = gkgfx CPPSRCS = \ @@ -71,6 +69,4 @@ CPPSRCS = \ include $(topsrcdir)/config/rules.mk -ifdef MOZ_ENABLE_CAIRO_GFX CXXFLAGS += $(MOZ_CAIRO_CFLAGS) -endif diff --git a/widget/src/build/Makefile.in b/widget/src/build/Makefile.in index 294ca487ce1..a07757dc9e3 100644 --- a/widget/src/build/Makefile.in +++ b/widget/src/build/Makefile.in @@ -66,11 +66,9 @@ REQUIRES = xpcom \ CPPSRCS = nsWinWidgetFactory.cpp -EXTRA_DSO_LIBS = gkgfx - -ifdef MOZ_ENABLE_CAIRO_GFX -EXTRA_DSO_LIBS += thebes -endif +EXTRA_DSO_LIBS = gkgfx \ + thebes \ + $(NULL) LOCAL_INCLUDES = \ -I$(srcdir) \