Mesa (master): xmlpool: make sure we ship options.h

Emil Velikov evelikov at kemper.freedesktop.org
Thu Mar 5 14:51:51 UTC 2015


Module: Mesa
Branch: master
Commit: 8d8ca64c28170ec7e9ffa01638bcf8fd30a96088
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d8ca64c28170ec7e9ffa01638bcf8fd30a96088

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Mon Mar  2 15:58:21 2015 +0000

xmlpool: make sure we ship options.h

The header is included in ../xmlpool.h. With the latter of which used
directly in a number of places in mesa.
Note that we can also add it (alongside t_option.h) to noinst_HEADERS,
but neither solution fixes the issue that brough us here - namely:
Do not regenerate the headers, if it already exists.

Cc: "10.5" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/common/xmlpool/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/common/xmlpool/Makefile.am b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
index da7d034..5557716 100644
--- a/src/mesa/drivers/dri/common/xmlpool/Makefile.am
+++ b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
@@ -52,7 +52,7 @@ POT=xmlpool.pot
 
 .PHONY: all clean pot po mo
 
-EXTRA_DIST = gen_xmlpool.py t_options.h $(POS) SConscript
+EXTRA_DIST = gen_xmlpool.py options.h t_options.h $(POS) SConscript
 BUILT_SOURCES = options.h
 CLEANFILES = $(MOS) options.h
 




More information about the mesa-commit mailing list