diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 282da58f9..7b7680738 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -21,13 +21,15 @@ Xwayland_SOURCES =				\
 	$(top_srcdir)/Xi/stubs.c		\
 	$(top_srcdir)/mi/miinitext.c
 
+if GLAMOR
 if GLX
 Xwayland_SOURCES += 				\
 	xwayland-glx.c
 Xwayland_CFLAGS +=				\
 	-I$(top_srcdir)/glx
 GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
-endif
+endif #GLX
+endif # GLAMOR
 
 Xwayland_LDADD =				\
 	$(glamor_lib)				\