diff options
| author | Chia-I Wu <[email protected]> | 2010-04-26 12:56:44 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-05-07 10:41:11 +0800 |
| commit | 296adbd545b8efd38c9ed508166b2de2764a444b (patch) | |
| tree | b146a292769007902a0aca98cfdd9d8ce7c44b59 /src/mesa/es/Makefile | |
| parent | 73ded0624de66bc83ae990530febb129d950d04b (diff) | |
glapi: Move to src/mapi/.
Move glapi to src/mapi/{glapi,es1api,es2api}.
Diffstat (limited to 'src/mesa/es/Makefile')
| -rw-r--r-- | src/mesa/es/Makefile | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile index 5498b086aab..426799abf1b 100644 --- a/src/mesa/es/Makefile +++ b/src/mesa/es/Makefile @@ -6,18 +6,16 @@ MESA := .. include $(TOP)/configs/current include sources.mak -ES1_LIBS := libes1gallium.a libes1api.a -ES2_LIBS := libes2gallium.a libes2api.a +ES1_LIBS := libes1gallium.a +ES2_LIBS := libes2gallium.a # Default rule: create ES1 and ES2 libs -.PHONY: default es1 es2 -default: depend es1 es2 +.PHONY: default subdirs es1 es2 +default: depend subdirs es1 es2 es1: $(ES1_LIBS) - @rm -f subdirs-stamp-tmp es2: $(ES2_LIBS) - @rm -f subdirs-stamp-tmp ES1_CPPFLAGS := -DFEATURE_ES1=1 -D__GL_EXPORTS ES2_CPPFLAGS := -DFEATURE_ES2=1 -D__GL_EXPORTS @@ -28,11 +26,9 @@ ES2_OBJ_DIR := objs-es2 # adjust output dirs ES1_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(ES1_OBJECTS)) ES1_GALLIUM_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(ES1_GALLIUM_OBJECTS)) -ES1_API_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(ES1_API_OBJECTS)) ES2_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(ES2_OBJECTS)) ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(ES2_GALLIUM_OBJECTS)) -ES2_API_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(ES2_API_OBJECTS)) # compile either ES1 or ES2 sources define es-compile @@ -76,36 +72,22 @@ libes1gallium.a: $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS) libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS) @$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS) -libes1api.a: $(ES1_API_OBJECTS) - @$(MKLIB) -o es1api -static $(ES1_API_OBJECTS) - -libes2api.a: $(ES2_API_OBJECTS) - @$(MKLIB) -o es2api -static $(ES2_API_OBJECTS) - .PHONY: clean clean: -rm -f $(ES1_LIBS) $(ES2_LIBS) -rm -rf $(ES1_OBJ_DIR) $(ES2_OBJ_DIR) - -rm -f $(GENERATED_SOURCES) -rm -f depend depend.bak - -rm -f subdirs-stamp-tmp - @$(MAKE) -C glapi clean # nothing to install install: -subdirs-stamp-tmp: +subdirs: @$(MAKE) -C $(MESA) asm_subdirs @$(MAKE) -C $(MESA) glsl_builtin - @$(MAKE) -C glapi - @touch subdirs-stamp-tmp # sort to avoid duplicates ALL_SOURCES := $(sort $(ES1_ALL_SOURCES) $(ES2_ALL_SOURCES)) -# need to make sure the subdirs are processed first -$(ALL_SOURCES): | subdirs-stamp-tmp - depend: $(ALL_SOURCES) @echo "running $(MKDEP)" @touch depend |