Bug 560147: Bustage follow-up, build src/thebes after thebes has been built. r=ted
authorBas Schouten <bschouten@mozilla.com>
Thu, 29 Apr 2010 16:21:55 +0200
changeset 41537 74e96463cdf935b5f55348a9405fbcbd223a8c5b
parent 41536 88295b6d23c269d0b8b932a924596103e18622ff
child 41538 5a0eb7abe752c9318b1e9e99973cfa699b5ef7b7
push id13057
push userbschouten@mozilla.com
push dateThu, 29 Apr 2010 14:26:44 +0000
treeherdermozilla-central@74e96463cdf9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs560147
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 560147: Bustage follow-up, build src/thebes after thebes has been built. r=ted
gfx/Makefile.in
gfx/src/Makefile.in
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -53,17 +53,17 @@ endif
 # order listed in DIRS. On shared builds ycbcr must
 # be built first so the order is reversed.
 ifdef BUILD_STATIC_LIBS
 DIRS		+= layers ycbcr
 else
 DIRS            += ycbcr layers
 endif
 
-DIRS		+= public idl src qcms thebes
+DIRS		+= public idl src qcms thebes src/thebes
 
 ifdef MOZ_IPC
 DIRS		+= ipc
 endif
 
 ifdef ENABLE_TESTS
 ifndef MOZ_ENABLE_LIBXUL
 TOOL_DIRS	+= tests
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE      = gfx
 LIBRARY_NAME    = gkgfx
 EXPORT_LIBRARY = 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
-DIRS        = thebes
-
 ifdef MOZ_ENABLE_POSTSCRIPT
 DIRS        += psshared
 endif
 
 CPPSRCS = \
         nsColor.cpp \
         nsFont.cpp \
         nsRect.cpp \