summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2012-12-03 15:43:19 -0800
committerCarl Worth <[email protected]>2013-01-11 13:54:54 -0800
commitb587a7595e7aae0809a8e7392e89c39df0c955b1 (patch)
treecf73d53420456623ec9974cc9ee52e5ee04b07bc /src/mesa/drivers/dri/i915
parent8888c6f8e50f3e5e316d2f41556162bec9a685d4 (diff)
driconf: Add translation-generation to build system, don't track generated files
Previously, the xmlpool directory had a lone Makefile to assist poeple in manually invoking a deep make in order to update the translations in options.h. We can observe that this wasn't happening in fact, (new translations had been added to de.po without being generated into options.h, and new options had been manually added directly to options.h rather than to t_options.h). Prevent both of these problems from occurring in the future by automatically generating options.h as part of the standard build of mesa. For this, the generated options.h is now removed from version control, (along with Makefile in favor of Makefile.am). [chadv: Port the Autotools changes to Android.] Signed-off-by: Chad Versace <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
-rw-r--r--src/mesa/drivers/dri/i915/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk
index 6964fb1eb93..c74e11cd59e 100644
--- a/src/mesa/drivers/dri/i915/Android.mk
+++ b/src/mesa/drivers/dri/i915/Android.mk
@@ -51,5 +51,8 @@ LOCAL_SHARED_LIBRARIES := \
$(MESA_DRI_SHARED_LIBRARIES) \
libdrm_intel
+LOCAL_GENERATED_SOURCES := \
+ $(MESA_DRI_OPTIONS_H)
+
include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY)