--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -47,23 +47,25 @@ MODULE		= gfx
 ifdef MOZ_TREE_CAIRO
 DIRS		= cairo
 endif
 
 # In static builds, ycbcr must appear after layers in
 # the link line on linux. This order is defined by the
 # 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
+ifndef BUILD_STATIC_LIBS
+DIRS		+= ycbcr
 endif
 
-DIRS		+= public idl src qcms thebes src/thebes
+DIRS		+= public idl src qcms layers thebes src/thebes
+
+ifdef BUILD_STATIC_LIBS
+DIRS		+= ycbcr
+endif
 
 ifdef MOZ_IPC
 DIRS		+= ipc
 endif
 
 ifdef ENABLE_TESTS
 ifndef MOZ_ENABLE_LIBXUL
 TOOL_DIRS	+= tests