Bug 560147: Follow-up fixing non-libxul builds. This will include layers into thebes.dll, and ensure thebes.dll exposes the correct symbols. r=ted

embedding/browser/build/Makefile.in

@@ -52,7 +52,7 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 
-EXTRA_DSO_LIBS	= gkgfx thebes layers
+EXTRA_DSO_LIBS	= gkgfx thebes
 
 CPPSRCS		= \
 		nsWebBrowserModule.cpp		\

gfx/Makefile.in

@@ -48,8 +48,6 @@ ifdef MOZ_TREE_CAIRO
 DIRS		= cairo
 endif
 
-DIRS		+= thebes public idl src qcms
-
 # 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
@@ -60,6 +58,8 @@ else
 DIRS            += ycbcr layers
 endif
 
+DIRS		+= public idl src qcms thebes
+
 ifdef MOZ_IPC
 DIRS		+= ipc
 endif

gfx/layers/Makefile.in

@@ -46,10 +46,10 @@ VPATH       = \
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE         = layers
+MODULE         = thebes
 LIBRARY_NAME   = layers
-EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
+FORCE_STATIC_LIB = 1
 
 DEFINES += -DIMPL_THEBES
 
@@ -69,20 +69,6 @@ CPPSRCS = \
         ImageLayerOGL.cpp \
         $(NULL)
 
-EXTRA_DSO_LIBS = \
-        gkgfx \
-        thebes \
-        ycbcr \
-        $(NULL)
-
-EXTRA_DSO_LDOPTS += \
-        $(LIBS_DIR) \
-        $(EXTRA_DSO_LIBS) \
-        $(MOZ_CAIRO_LIBS) \
-        $(XPCOM_LIBS) \
-        $(NSPR_LIBS) \
-        $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS)

gfx/thebes/src/Makefile.in

@@ -35,8 +35,21 @@ CPPSRCS	= \
 	GLContext.cpp \
 	$(NULL)
 
+SHARED_LIBRARY_LIBS += \
+	../../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \
+	$(NULL)
+
+
+ifndef MOZ_ENABLE_LIBXUL
+EXTRA_DSO_LIBS	= gkgfx ycbcr
+ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
+CPPSRCS += gfxDllDeps.cpp
+endif
+endif
+
 EXTRA_DSO_LDOPTS += \
 	$(MOZ_CAIRO_LIBS) \
+	$(EXTRA_DSO_LIBS) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(XPCOM_LIBS) \
 	$(NSPR_LIBS) \

gfx/thebes/src/gfxDllDeps.cpp

@@ -0,0 +1,4 @@
+#include "Layers.h"
+#include "LayerManagerOGL.h"
+#include "BasicLayers.h"
+#include "ImageLayers.h"

layout/build/Makefile.in

@@ -61,7 +61,7 @@ LIBXUL_LIBRARY	= 1
 ifndef MOZ_ENABLE_LIBXUL
 EXTRA_DSO_LIBS	= gkgfx gfxutils
 endif
-EXTRA_DSO_LIBS	+= thebes layers ycbcr
+EXTRA_DSO_LIBS	+= thebes ycbcr
 
 
 CPPSRCS		= \

toolkit/library/libxul-config.mk

@@ -307,7 +307,7 @@ DEFINES += -DICON_DECODER
 COMPONENT_LIBS += imgicon
 endif
 
-STATIC_LIBS += thebes layers ycbcr
+STATIC_LIBS += thebes ycbcr
 COMPONENT_LIBS += gkgfxthebes
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))

widget/src/build/Makefile.in

@@ -55,7 +55,6 @@ CPPSRCS		= nsWinWidgetFactory.cpp
 
 EXTRA_DSO_LIBS	= gkgfx \
 		  thebes \
-		  layers \
 		  $(NULL)
 
 LOCAL_INCLUDES	= \

widget/src/cocoa/Makefile.in

@@ -106,7 +106,6 @@ EXTRA_DSO_LDOPTS += \
 		$(call EXPAND_LIBNAME_PATH,gkgfx,$(DEPTH)/gfx/src) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lthebes \
-		-llayers \
 		$(QCMS_LIBS) \
 		$(NULL)
 

widget/src/gtk2/Makefile.in

@@ -109,7 +109,6 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
 		-lthebes \
-		-llayers \
 		$(MOZ_CAIRO_LIBS) \
                 $(MOZ_STARTUP_NOTIFICATION_LIBS) \
 		$(XLDFLAGS) \

widget/src/os2/Makefile.in

@@ -89,7 +89,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lthebes \
-		-llayers \
 		$(QCMS_LIBS) \
 		$(NULL)
 

widget/src/qt/Makefile.in

@@ -88,7 +88,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
 		-lthebes \
-		-llayers \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_QT_LIBS) \
 		$(GLIB_LIBS) \