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 681928cf26022a227224d70eab79fdcf3ad35829..ed959dae302ad8709400db832edd9bf58a6d5838 100755 (executable)
--- 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 822e466ad1b517afa9b20e38fea6cc65d50f7583..32fea2c4dd8ce813bffe855beab613e477b105cd 100644 (file)
--- 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 6c78ae90a9689506c302ccc43e5df3fb7f9f9471..b4a903cb68ff5be8bbc92246af6c8a88872fa430 100644 (file)
--- 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 87a4d2164bd114bc69e25198ee6d476f9f9d36e9..f480da047eb1049fbacf3d0bc184887436afedd9 100644 (file)
--- 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