From 7aae8a592a299abd881372d3a2850375c2bb8884 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Sat, 24 Apr 2010 19:17:54 -0400
Subject: [PATCH] mesa: Move get_es*.c to main/

---
 src/mesa/Makefile                                   |  5 +++++
 src/mesa/es/Makefile                                | 10 ----------
 src/mesa/es/sources.mak                             |  2 --
 src/mesa/{es/main/get_gen.py => main/get_gen_es.py} |  0
 src/mesa/sources.mak                                |  2 ++
 5 files changed, 7 insertions(+), 12 deletions(-)
 rename src/mesa/{es/main/get_gen.py => main/get_gen_es.py} (100%)

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 7dcde52..e404088 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 b095620..5498b08 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 3beea38..8526820 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
similarity index 100%
rename from src/mesa/es/main/get_gen.py
rename to src/mesa/main/get_gen_es.py
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 72b46e9..df16e70 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 \
-- 
2.7.4