Replaced funky state machines with classes. This is in preparation of doing the same to gl_Bench.

client/deps/glbench/src/Makefile

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 SOURCES_COMMON = xlib_window.cc utils.cc
 SOURCES_GL_BENCH = main.cc bench.cc shaders.cc
 SOURCES_TEARTEST = teartest.cc
 SOURCES_WINDOWMANAGERTEST = windowmanagertest.cc
 SOURCES_ALL = $(SOURCES_COMMON) \
               $(SOURCES_GL_BENCH) \
               $(SOURCES_TEARTEST) \
               $(SOURCES_WINDOWMANAGERTEST)
 
 CXXFLAGS = -g -Wall -Werror -I$(GCLIENT_ROOT)/src/third_party/chrome/files
 LDFLAGS = -lGL -lX11
 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/chrome -lbase -lrt -lgflags
 GL_BENCH = ../glbench
 TEARTEST = ../teartest
 WINDOWMANAGERTEST = ../windowmanagertest
 
 GCLIENT_ROOT ?= ../../../../../../../..
 
 ifdef USE_EGL
-CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include
+CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include -DUSE_EGL
 SOURCES_COMMON += egl_stuff.cc
 SOURCES_TEARTEST += teartest_egl.cc
 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/khronos/files -lEGL
 else
 SOURCES_COMMON += glx_stuff.cc
 SOURCES_TEARTEST += teartest_glx.cc
 endif
 
 OBJS_COMMON = $(SOURCES_COMMON:.cc=.o)
 OBJS_GL_BENCH = $(SOURCES_GL_BENCH:.cc=.o)
 OBJS_TEARTEST = $(SOURCES_TEARTEST:.cc=.o)
 OBJS_WINDOWMANAGERTEST = $(SOURCES_WINDOWMANAGERTEST:.cc=.o)
 OBJS_ALL = $(SOURCES_ALL:.cc=.o)
 DEPS_ALL = $(SOURCES_ALL:.cc=.d)
 
 .PHONY: all clean
 
-all: $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST)
+all: $(GL_BENCH) $(TEARTEST)
+
+ifndef USE_EGL
+all: $(WINDOWMANAGERTEST)
+endif
 
 $(TEARTEST): $(OBJS_COMMON) $(OBJS_TEARTEST)
 $(GL_BENCH): $(OBJS_COMMON) $(OBJS_GL_BENCH)
 $(WINDOWMANAGERTEST): $(OBJS_COMMON) $(OBJS_WINDOWMANAGERTEST)
 
 clean:
         $(RM) $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST)
         $(RM) $(OBJS_ALL) $(DEPS_ALL)
 
 $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST):
         $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS)
 
 $(OBJS_ALL): %.o: %.cc
         $(CXX) $(CXXFLAGS) -c $< -o $@ -MMD
 
 -include $(DEPS_ALL)