mesa/es: Fix symbol conflicts and warnings.

drawtex.c was listed in LOCAL_ES1_SOURCES twice.  My mistake when
merging the patches.

Also, run gl_apitemp.py with -c to silence warnings and add target
"install".

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile
index 42347d0b07965ea0637e040d5da17bb1ff4c56f8..48b11a6ad2352811fde82e0d6db5879af3a0b4a3 100644 (file)
--- a/src/mesa/es/Makefile
+++ b/src/mesa/es/Makefile
@@ -107,6 +107,9 @@ clean:
        -rm -f depend
        -rm -f *~
 
+# nothing to install
+install:
+
 subdirs:
        make -C glapi
        make -C $(MESA) asm_subdirs

diff --git a/src/mesa/es/glapi/Makefile b/src/mesa/es/glapi/Makefile
index 5f2aa8225b60fdd525df8cc858896197890b222d..1e32af867d5823cf5aca9b1c5fb290a23d7e12f8 100644 (file)
--- a/src/mesa/es/glapi/Makefile
+++ b/src/mesa/es/glapi/Makefile
@@ -52,7 +52,7 @@ endef
        $(call gen-glapi,-c)
 
 %/glapitemp.h: $(GLAPI)/gl_apitemp.py $(COMMON)
-       $(call gen-glapi)
+       $(call gen-glapi,-c)
 
 %/glprocs.h: $(GLAPI)/gl_procs.py $(COMMON)
        $(call gen-glapi,-c)

diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index 11f735d52af40b40867af9bdb214e32ec2ff23f1..f00e41b0115599717776e8888d15be4560f3b0bf 100644 (file)
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -4,7 +4,6 @@ include $(MESA)/sources.mak
 
 LOCAL_ES1_SOURCES :=                   \
        main/api_exec_es1.c             \
-       main/drawtex.c                  \
        main/get_es1.c                  \
        main/specials_es1.c             \
        main/drawtex.c                  \