summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2010-04-24 19:17:54 -0400
committerKristian Høgsberg <krh@bitplanet.net>2010-04-27 19:28:11 -0400
commit7aae8a592a299abd881372d3a2850375c2bb8884 (patch)
tree48fb9962c90f050446b84a2efa16f2c6780ab16d
parent003433989597771bbb4f03cf678f5771c09606fd (diff)
mesa: Move get_es*.c to main/
-rw-r--r--src/mesa/Makefile5
-rw-r--r--src/mesa/es/Makefile10
-rw-r--r--src/mesa/es/sources.mak2
-rw-r--r--src/mesa/main/get_gen_es.py (renamed from src/mesa/es/main/get_gen.py)0
-rw-r--r--src/mesa/sources.mak2
5 files changed, 7 insertions, 12 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 7dcde5275e..e4040881f1 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -30,6 +30,11 @@ main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m
main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@
+main/get_es1.c: main/get_gen_es.py
+ $(PYTHON2) $(PYTHON_FLAGS) $< 1 > $@
+
+main/get_es2.c: main/get_gen_es.py
+ $(PYTHON2) $(PYTHON_FLAGS) $< 2 > $@
######################################################################
# Helper libraries used by many drivers:
diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile
index b095620c9d..5498b086aa 100644
--- a/src/mesa/es/Makefile
+++ b/src/mesa/es/Makefile
@@ -82,16 +82,6 @@ libes1api.a: $(ES1_API_OBJECTS)
libes2api.a: $(ES2_API_OBJECTS)
@$(MKLIB) -o es2api -static $(ES2_API_OBJECTS)
-GENERATED_SOURCES := \
- main/get_es1.c \
- main/get_es2.c
-
-main/get_es1.c: main/get_gen.py
- $(PYTHON2) $(PYTHON_FLAGS) $< 1 > $@
-
-main/get_es2.c: main/get_gen.py
- $(PYTHON2) $(PYTHON_FLAGS) $< 2 > $@
-
.PHONY: clean
clean:
-rm -f $(ES1_LIBS) $(ES2_LIBS)
diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index 3beea38884..8526820c80 100644
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -3,7 +3,6 @@ include $(MESA)/sources.mak
# LOCAL sources
LOCAL_ES1_SOURCES := \
- main/get_es1.c \
main/drawtex.c \
main/es_cpaltex.c \
main/es_enable.c \
@@ -25,7 +24,6 @@ LOCAL_ES1_INCLUDES := \
-I$(MESA)/state_tracker
LOCAL_ES2_SOURCES := \
- main/get_es2.c \
main/es_cpaltex.c \
glapi/glapi-es2/main/enums.c
diff --git a/src/mesa/es/main/get_gen.py b/src/mesa/main/get_gen_es.py
index 5fadfee841..5fadfee841 100644
--- a/src/mesa/es/main/get_gen.py
+++ b/src/mesa/main/get_gen_es.py
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 72b46e981f..df16e70c95 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -39,6 +39,8 @@ MAIN_SOURCES = \
main/formats.c \
main/framebuffer.c \
main/get.c \
+ main/get_es1.c \
+ main/get_es2.c \
main/getstring.c \
main/hash.c \
main/hint.c \