summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-02-26 10:48:07 +0100
committerMichel Dänzer <michel@daenzer.net>2010-02-26 10:48:07 +0100
commit0c20b3033309f5d71af835b4eb5680ec7384e1f7 (patch)
tree0b37c37d952b30e9a28b2413c435851ebfa27044
parent2da7f1af3849b81778cb722e8f1f02c17a49a2e0 (diff)
downloadexternal_mesa3d-0c20b3033309f5d71af835b4eb5680ec7384e1f7.zip
external_mesa3d-0c20b3033309f5d71af835b4eb5680ec7384e1f7.tar.gz
external_mesa3d-0c20b3033309f5d71af835b4eb5680ec7384e1f7.tar.bz2
Fix up more stale references to gl(X)_API.xml which have moved.
AFAICT the getproc* stanzas in progs/{fp,trivial}/Makefile are completely unused at this point, so just remove them.
-rwxr-xr-xprogs/fp/Makefile8
-rw-r--r--progs/tools/trace/Makefile2
-rw-r--r--progs/trivial/Makefile8
-rw-r--r--progs/trivial/SConscript2
4 files changed, 2 insertions, 18 deletions
diff --git a/progs/fp/Makefile b/progs/fp/Makefile
index 681928c..ed959da 100755
--- a/progs/fp/Makefile
+++ b/progs/fp/Makefile
@@ -56,14 +56,6 @@ default: $(UTIL_FILES) $(PROGS)
clean:
-rm -f $(PROGS)
-rm -f *.o
- -rm -f getproclist.h
-
-
-# auto code generation
-getprocaddress: getprocaddress.c getproclist.h
-
-getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress.py
- python getprocaddress.py > getproclist.h
texrect: texrect.o readtex.o
diff --git a/progs/tools/trace/Makefile b/progs/tools/trace/Makefile
index 822e466..32fea2c 100644
--- a/progs/tools/trace/Makefile
+++ b/progs/tools/trace/Makefile
@@ -20,7 +20,7 @@ $(TRACER): $(OBJECTS)
-ldflags '$(LDFLAGS)' $(MKLIB_OPTIONS) $(OBJECTS)
gltrace.cc: gltrace.py
- PYTHONPATH=$(TOP)/src/mesa/glapi python gltrace.py -f $(TOP)/src/mesa/glapi/gl_API.xml > gltrace.cc
+ PYTHONPATH=$(TOP)/src/mesa/glapi/gen python gltrace.py -f $(TOP)/src/mesa/glapi/gen/gl_API.xml > gltrace.cc
clean:
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile
index 6c78ae9..b4a903c 100644
--- a/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@ -205,14 +205,6 @@ default: $(UTIL_FILES) $(PROGS)
clean:
-rm -f $(PROGS)
-rm -f *.o
- -rm -f getproclist.h
-
-
-# auto code generation
-getprocaddress: getprocaddress.c getproclist.h
-
-getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress.py
- python getprocaddress.py > getproclist.h
texrect: texrect.o readtex.o
diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript
index 87a4d21..f480da0 100644
--- a/progs/trivial/SConscript
+++ b/progs/trivial/SConscript
@@ -158,7 +158,7 @@ for prog in progs:
# auto code generation
#getprocaddress: getprocaddress.c getproclist.h
-#getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress.py
+#getproclist.h: $(TOP)/src/mesa/glapi/gen/gl_API.xml getprocaddress.c getprocaddress.py
# python getprocaddress.py > getproclist.h