From: Michel Dänzer <daenzer@vmware.com>
Date: Fri, 26 Feb 2010 09:48:07 +0000 (+0100)
Subject: Fix up more stale references to gl(X)_API.xml which have moved.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c20b3033309f5d71af835b4eb5680ec7384e1f7;p=mesa.git

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.
---

diff --git a/progs/fp/Makefile b/progs/fp/Makefile
index 681928cf260..ed959dae302 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 822e466ad1b..32fea2c4dd8 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 6c78ae90a96..b4a903cb68f 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 87a4d2164bd..f480da047eb 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