diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-04-27 09:00:31 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-04-28 14:05:20 -0400 |
| commit | 3bd6e003462e579c6c1b4a62d8e5f26cb314862d (patch) | |
| tree | b7920f9d20cd2eb84afe3634e9970a8337657420 | |
| parent | 21ad81727c9dfe83dfe7e06937e9142e8e652fba (diff) | |
es: Drop es specific enums.c
| -rw-r--r-- | src/mesa/es/glapi/Makefile | 4 | ||||
| -rw-r--r-- | src/mesa/es/sources.mak | 21 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/mesa/es/glapi/Makefile b/src/mesa/es/glapi/Makefile index e8a9afab7c..a388f073cf 100644 --- a/src/mesa/es/glapi/Makefile +++ b/src/mesa/es/glapi/Makefile @@ -11,7 +11,6 @@ OUTPUTS := \ sparc/glapi_sparc.S \ x86-64/glapi_x86-64.S \ x86/glapi_x86.S \ - main/enums.c \ main/remap_helper.h COMMON = gl_XML.py glX_XML.py license.py typeexpr.py @@ -66,9 +65,6 @@ endef %/x86/glapi_x86.S: $(GLAPI)/gl_x86_asm.py $(COMMON) $(call gen-glapi) -%/main/enums.c: $(GLAPI)/gl_enums.py $(COMMON) - $(call gen-glapi) - %/main/remap_helper.h: $(GLAPI)/remap_helper.py $(COMMON) $(call gen-glapi) diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak index 6ddbcfdffc..96199d6396 100644 --- a/src/mesa/es/sources.mak +++ b/src/mesa/es/sources.mak @@ -2,11 +2,7 @@ include $(MESA)/sources.mak # LOCAL sources -LOCAL_ES1_SOURCES := \ - glapi/glapi-es1/main/enums.c - LOCAL_ES1_GALLIUM_SOURCES := \ - $(LOCAL_ES1_SOURCES) \ state_tracker/st_cb_drawtex.c # always use local version of GLAPI_ASM_SOURCES @@ -18,12 +14,6 @@ LOCAL_ES1_INCLUDES := \ -I./state_tracker \ -I$(MESA)/state_tracker -LOCAL_ES2_SOURCES := \ - glapi/glapi-es2/main/enums.c - -LOCAL_ES2_GALLIUM_SOURCES := \ - $(LOCAL_ES2_SOURCES) - LOCAL_ES2_API_ASM := $(subst es1,es2, $(LOCAL_ES1_API_ASM)) LOCAL_ES2_INCLUDES := $(subst es1,es2, $(LOCAL_ES1_INCLUDES)) @@ -34,7 +24,6 @@ MAIN_OMITTED := \ main/api_exec.c \ main/condrender.c \ main/dlopen.c \ - main/enums.c \ main/get.c MAIN_SOURCES := $(filter-out $(MAIN_OMITTED), $(MAIN_SOURCES)) @@ -86,7 +75,6 @@ MESA_ES1_API_SOURCES := \ MESA_ES1_INCLUDES := $(INCLUDE_DIRS) # remove LOCAL sources from MESA sources -MESA_ES1_SOURCES := $(filter-out $(LOCAL_ES1_SOURCES), $(MESA_ES1_SOURCES)) MESA_ES1_GALLIUM_SOURCES := $(filter-out $(LOCAL_ES1_GALLIUM_SOURCES), $(MESA_ES1_GALLIUM_SOURCES)) # right now es2 and es1 share MESA sources @@ -100,12 +88,12 @@ MESA_ES2_INCLUDES := $(MESA_ES1_INCLUDES) MESA_ES_ASM := $(MESA_ASM_SOURCES) # collect sources, adjust the pathes -ES1_SOURCES := $(LOCAL_ES1_SOURCES) $(addprefix $(MESA)/,$(MESA_ES1_SOURCES)) +ES1_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_SOURCES)) ES1_GALLIUM_SOURCES := $(LOCAL_ES1_GALLIUM_SOURCES) $(addprefix $(MESA)/,$(MESA_ES1_GALLIUM_SOURCES)) ES1_API_SOURCES := $(addprefix $(MESA)/,$(MESA_ES1_API_SOURCES)) -ES2_SOURCES := $(LOCAL_ES2_SOURCES) $(addprefix $(MESA)/,$(MESA_ES2_SOURCES)) -ES2_GALLIUM_SOURCES := $(LOCAL_ES2_GALLIUM_SOURCES) $(addprefix $(MESA)/,$(MESA_ES2_GALLIUM_SOURCES)) +ES2_SOURCES := $(addprefix $(MESA)/,$(MESA_ES2_SOURCES)) +ES2_GALLIUM_SOURCES := $(addprefix $(MESA)/,$(MESA_ES2_GALLIUM_SOURCES)) ES2_API_SOURCES := $(addprefix $(MESA)/,$(MESA_ES2_API_SOURCES)) # collect includes @@ -114,7 +102,6 @@ ES2_INCLUDES := $(LOCAL_ES2_INCLUDES) $(MESA_ES2_INCLUDES) # collect objects, including asm ES1_OBJECTS := \ - $(LOCAL_ES1_SOURCES:.c=.o) \ $(MESA_ES1_SOURCES:.c=.o) \ $(MESA_ES_ASM:.S=.o) @@ -128,12 +115,10 @@ ES1_API_OBJECTS := \ $(MESA_ES1_API_SOURCES:.c=.o) ES2_OBJECTS := \ - $(LOCAL_ES2_SOURCES:.c=.o) \ $(MESA_ES2_SOURCES:.c=.o) \ $(MESA_ES_ASM:.S=.o) ES2_GALLIUM_OBJECTS := \ - $(LOCAL_ES2_GALLIUM_SOURCES:.c=.o) \ $(MESA_ES2_GALLIUM_SOURCES:.c=.o) \ $(MESA_ES_ASM:.S=.o) |