| OLD | NEW | 
|---|
| 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 SOURCES_COMMON = xlib_window.cc utils.cc | 5 SOURCES_COMMON = xlib_window.cc utils.cc | 
| 6 SOURCES_GL_BENCH = main.cc bench.cc shaders.cc | 6 SOURCES_GL_BENCH = main.cc bench.cc shaders.cc | 
| 7 SOURCES_TEARTEST = teartest.cc | 7 SOURCES_TEARTEST = teartest.cc | 
| 8 SOURCES_ALL = $(SOURCES_COMMON) $(SOURCES_GL_BENCH) $(SOURCES_TEARTEST) | 8 SOURCES_WINDOWMANAGERTEST = windowmanagertest.cc | 
|  | 9 SOURCES_ALL = $(SOURCES_COMMON) \ | 
|  | 10               $(SOURCES_GL_BENCH) \ | 
|  | 11               $(SOURCES_TEARTEST) \ | 
|  | 12               $(SOURCES_WINDOWMANAGERTEST) | 
| 9 | 13 | 
| 10 CXXFLAGS = -g -Wall -Werror -I$(GCLIENT_ROOT)/src/third_party/chrome/files | 14 CXXFLAGS = -g -Wall -Werror -I$(GCLIENT_ROOT)/src/third_party/chrome/files | 
| 11 LDFLAGS = -lGL -lX11 | 15 LDFLAGS = -lGL -lX11 | 
| 12 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/chrome -lbase -lrt -lgflags | 16 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/chrome -lbase -lrt -lgflags | 
| 13 GL_BENCH = ../glbench | 17 GL_BENCH = ../glbench | 
| 14 TEARTEST = ../teartest | 18 TEARTEST = ../teartest | 
|  | 19 WINDOWMANAGERTEST = ../windowmanagertest | 
| 15 | 20 | 
| 16 GCLIENT_ROOT ?= ../../../../../../../.. | 21 GCLIENT_ROOT ?= ../../../../../../../.. | 
| 17 | 22 | 
| 18 ifdef USE_EGL | 23 ifdef USE_EGL | 
| 19 CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include | 24 CXXFLAGS += -I$(GCLIENT_ROOT)/src/third_party/khronos/files/include | 
| 20 SOURCES_COMMON += egl_stuff.cc | 25 SOURCES_COMMON += egl_stuff.cc | 
| 21 SOURCES_TEARTEST += teartest_egl.cc | 26 SOURCES_TEARTEST += teartest_egl.cc | 
| 22 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/khronos/files -lEGL | 27 LDFLAGS += -L$(GCLIENT_ROOT)/src/third_party/khronos/files -lEGL | 
| 23 else | 28 else | 
| 24 SOURCES_COMMON += glx_stuff.cc | 29 SOURCES_COMMON += glx_stuff.cc | 
| 25 SOURCES_TEARTEST += teartest_glx.cc | 30 SOURCES_TEARTEST += teartest_glx.cc | 
| 26 endif | 31 endif | 
| 27 | 32 | 
| 28 OBJS_COMMON = $(SOURCES_COMMON:.cc=.o) | 33 OBJS_COMMON = $(SOURCES_COMMON:.cc=.o) | 
| 29 OBJS_GL_BENCH = $(SOURCES_GL_BENCH:.cc=.o) | 34 OBJS_GL_BENCH = $(SOURCES_GL_BENCH:.cc=.o) | 
| 30 OBJS_TEARTEST = $(SOURCES_TEARTEST:.cc=.o) | 35 OBJS_TEARTEST = $(SOURCES_TEARTEST:.cc=.o) | 
|  | 36 OBJS_WINDOWMANAGERTEST = $(SOURCES_WINDOWMANAGERTEST:.cc=.o) | 
| 31 OBJS_ALL = $(SOURCES_ALL:.cc=.o) | 37 OBJS_ALL = $(SOURCES_ALL:.cc=.o) | 
| 32 DEPS_ALL = $(SOURCES_ALL:.cc=.d) | 38 DEPS_ALL = $(SOURCES_ALL:.cc=.d) | 
| 33 | 39 | 
| 34 .PHONY: all clean | 40 .PHONY: all clean | 
| 35 | 41 | 
| 36 all: $(GL_BENCH) $(TEARTEST) | 42 all: $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST) | 
| 37 | 43 | 
| 38 $(TEARTEST): $(OBJS_COMMON) $(OBJS_TEARTEST) | 44 $(TEARTEST): $(OBJS_COMMON) $(OBJS_TEARTEST) | 
| 39 $(GL_BENCH): $(OBJS_COMMON) $(OBJS_GL_BENCH) | 45 $(GL_BENCH): $(OBJS_COMMON) $(OBJS_GL_BENCH) | 
|  | 46 $(WINDOWMANAGERTEST): $(OBJS_COMMON) $(OBJS_WINDOWMANAGERTEST) | 
| 40 | 47 | 
| 41 clean: | 48 clean: | 
| 42 »       $(RM) $(GL_BENCH) $(TEARTEST) $(OBJS_ALL) $(DEPS_ALL) | 49 »       $(RM) $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST) | 
|  | 50 »       $(RM) $(OBJS_ALL) $(DEPS_ALL) | 
| 43 | 51 | 
| 44 $(GL_BENCH) $(TEARTEST): | 52 $(GL_BENCH) $(TEARTEST) $(WINDOWMANAGERTEST): | 
| 45         $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS) | 53         $(CXX) $^ -o $@ $(CXXFLAGS) $(LDFLAGS) | 
| 46 | 54 | 
| 47 $(OBJS_ALL): %.o: %.cc | 55 $(OBJS_ALL): %.o: %.cc | 
| 48         $(CXX) $(CXXFLAGS) -c $< -o $@ -MMD | 56         $(CXX) $(CXXFLAGS) -c $< -o $@ -MMD | 
| 49 | 57 | 
| 50 -include $(DEPS_ALL) | 58 -include $(DEPS_ALL) | 
| OLD | NEW | 
|---|