diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-07-01 01:27:00 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-07-01 01:27:00 +0000 |
| commit | f4f1c2959767a65cd592a978e238a039c15b9635 (patch) | |
| tree | 895fafc878afa2b0f980b914df49c28578f50327 | |
| parent | bb5c84fcbc22b4fef28cf4589d6410eb3c35a496 (diff) | |
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.
| -rw-r--r-- | configs/default | 7 | ||||
| -rw-r--r-- | src/mesa/glapi/Makefile | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/configs/default b/configs/default index 6dcfa7bb37..70014114a6 100644 --- 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 9f95349c9e..db3d0ca390 100644 --- 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 |