Fixing gtk2 bustage. r=cls.

embedding/components/build/Makefile.in

@@ -83,19 +83,7 @@ ifeq ($(MOZ_GFX_TOOLKIT),os2)
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/os2 
 endif
 
-ifeq ($(MOZ_GFX_TOOLKIT),gtk)
-LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/gtk 
-endif
-
-ifeq ($(MOZ_GFX_TOOLKIT),xlib)
-LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/gtk 
-endif
-
-ifeq ($(MOZ_GFX_TOOLKIT),beos)
-LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/gtk 
-endif
-
-ifeq ($(MOZ_GFX_TOOLKIT),qt)
+ifneq (,$(filter gtk gtk2 xlib beos qt, $(MOZ_WIDGET_TOOLKIT)))
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/gtk 
 endif
 

embedding/components/printingui/src/Makefile.in

@@ -26,16 +26,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_ENABLE_GTK
-DIRS        += gtk
-endif
-
-ifdef MOZ_ENABLE_XLIB
-DIRS        += gtk
-endif
-
-ifdef MOZ_ENABLE_QT
-DIRS        += gtk
+ifneq (,$(filter gtk gtk2 xlib qt beos,$(MOZ_WIDGET_TOOLKIT)))
+DIRS	+= gtk
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
@@ -46,10 +38,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 DIRS = win
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-DIRS = gtk
-endif
-
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = mac
 endif