summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2009-11-06 16:49:04 +0800
committerBrian Paul <brianp@vmware.com>2009-11-06 14:19:23 -0700
commitf1c7874cd95e19929030038a78d889ac095a122a (patch)
tree24177d6c8777a47f14ace2077ef61e80e2884493 /src/mesa
parent1af44e9e5a3b522dd083f7e1486146376b01fdff (diff)
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>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/es/Makefile3
-rw-r--r--src/mesa/es/glapi/Makefile2
-rw-r--r--src/mesa/es/sources.mak1
3 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile
index 42347d0b07..48b11a6ad2 100644
--- 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 5f2aa8225b..1e32af867d 100644
--- 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 11f735d52a..f00e41b011 100644
--- 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 \