diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
| commit | 0d495843cebea4ae94a3138db2bf51da80a16391 (patch) | |
| tree | 6e7b747c07035ae3a29ee3fb73e1eb43df7d2f8d /mesalib/src/mapi/glapi/gen/Makefile | |
| parent | 01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (diff) | |
| parent | f4babb3a422e27cd33fba36f7a21eb67b7dee25d (diff) | |
| download | vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.gz vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.bz2 vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/extensions/configure.ac
X11/xtrans/configure.ac
X11/xtrans/doc/Makefile.am
libX11/configure.ac
libX11/docbook.am
libXdmcp/configure.ac
libXdmcp/doc/Makefile.am
libXext/configure.ac
libXext/docbook.am
libXmu/configure.ac
libXmu/doc/Makefile.am
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/state_tracker/st_draw.c
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/Makefile')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile index 90fa18f7f..d0e97f3b2 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile +++ b/mesalib/src/mapi/glapi/gen/Makefile @@ -16,7 +16,8 @@ MESA_GLAPI_OUTPUTS = \ $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \
$(MESA_GLAPI_DIR)/glprocs.h \
$(MESA_GLAPI_DIR)/glapitemp.h \
- $(MESA_GLAPI_DIR)/glapitable.h
+ $(MESA_GLAPI_DIR)/glapitable.h \
+ $(MESA_GLAPI_DIR)/glapi_gentable.c
MESA_GLAPI_ASM_OUTPUTS = \
$(MESA_GLAPI_DIR)/glapi_x86.S \
@@ -50,7 +51,8 @@ XORG_GLAPI_OUTPUTS = \ $(XORG_GLAPI_DIR)/glprocs.h \
$(XORG_GLAPI_DIR)/glapioffsets.h \
$(XORG_GLAPI_DIR)/glapitable.h \
- $(XORG_GLAPI_DIR)/glapidispatch.h
+ $(XORG_GLAPI_DIR)/glapidispatch.h \
+ $(XORG_GLAPI_DIR)/glapi_gentable.c
XORG_OUTPUTS = \
$(XORG_GLAPI_FILES) \
@@ -162,6 +164,9 @@ $(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON) $(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON)
$(PYTHON2) $(PYTHON_FLAGS) $< > $@
+$(MESA_GLAPI_DIR)/glapi_gentable.c: gl_gentable.py $(COMMON)
+ $(PYTHON2) $(PYTHON_FLAGS) $< > $@
+
######################################################################
$(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
|