Move the PYTHON2 and PYTHON_FLAGS assignments to configs/current, and

include $(TOP)/configs/current in glapi/Makefile so those vars can be
easily overridden by any system config, if needed.

diff --git a/configs/default b/configs/default
index 6dcfa7bb37c4de985a59dbd185a7d3c46fc4f95c..70014114a6e4687bd70250bf96c75a3cd1d8f9d0 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -11,7 +11,8 @@ MESA_MINOR=3
 MESA_TINY=0
 
 # external projects
-DRM_SOURCE_PATH=$(TOP)/../drm
+#DRM_SOURCE_PATH=$(TOP)/../drm
+DRM_SOURCE_PATH=/home/projects/DRI-freedesktop/drm
 
 # Compiler and flags
 CC = cc
@@ -26,6 +27,10 @@ MKDEP = makedepend
 MKDEP_OPTIONS = -fdepend
 MAKE = make
 
+# Python and flags (generally only needed by the developers)
+PYTHON2 = python
+PYTHON_FLAGS = -t -O -O
+
 # Library names (base name)
 GL_LIB = GL
 GLU_LIB = GLU

diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 9f95349c9eb79c7d32dcc71089454aecc25377db..db3d0ca3901eaf80f3c683e1d28bdfb9b42d6400 100644 (file)
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -4,6 +4,9 @@
 # up to him/her to re-run this makefile and check in the newly generated files.
 
 
+TOP = ../../..
+include $(TOP)/configs/current
+
 OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h \
        ../main/enums.c \
        ../x86/glapi_x86.S \
@@ -17,9 +20,6 @@ OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h \
 COMMON = gl_XML.py license.py gl_API.xml typeexpr.py
 COMMON_GLX = $(COMMON) glX_XML.py glX_proto_common.py
 
-PYTHON2 = python
-PYTHON_FLAGS = -t -O -O
-
 all: $(OUTPUTS)
 
 glprocs.h: $(COMMON) gl_procs.py