diff --git a/allmakefiles.sh b/allmakefiles.sh
index fa703d8c65c..2f53dd3aa6b 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -157,6 +157,7 @@ gfx/src/xlib/Makefile
 gfx/src/os2/Makefile
 gfx/src/xlibrgb/Makefile
 gfx/src/windows/Makefile
+gfx/src/cairo/Makefile
 gfx/tests/Makefile
 "
 
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index e0028dbdcdf..6b24c55bada 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -86,17 +86,22 @@ endif
 ifdef MOZ_ENABLE_XPRINT
 DIRS        += xprintutil xprint 
 endif
-ifdef MOZ_ENABLE_GTK
-DIRS        += gtk
-endif
-ifdef MOZ_ENABLE_GTK2
-DIRS        += gtk
-endif
-ifdef MOZ_ENABLE_XLIB
-DIRS        += xlib
-endif
-ifdef MOZ_ENABLE_PHOTON
-DIRS        += photon
+
+ifdef MOZ_ENABLE_CAIRO_GFX
+DIRS        += cairo
+else
+ ifdef MOZ_ENABLE_GTK
+ DIRS        += gtk
+ endif
+ ifdef MOZ_ENABLE_GTK2
+ DIRS        += gtk
+ endif
+ ifdef MOZ_ENABLE_XLIB
+ DIRS        += xlib
+ endif
+ ifdef MOZ_ENABLE_PHOTON
+ DIRS        += photon
+ endif
 endif
 
 CPPSRCS = \