summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/Android.mk
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2012-12-03 15:43:19 -0800
committerCarl Worth <cworth@cworth.org>2013-01-11 13:54:54 -0800
commitb587a7595e7aae0809a8e7392e89c39df0c955b1 (patch)
treecf73d53420456623ec9974cc9ee52e5ee04b07bc /src/mesa/drivers/dri/Android.mk
parent8888c6f8e50f3e5e316d2f41556162bec9a685d4 (diff)
downloadexternal_mesa3d-b587a7595e7aae0809a8e7392e89c39df0c955b1.zip
external_mesa3d-b587a7595e7aae0809a8e7392e89c39df0c955b1.tar.gz
external_mesa3d-b587a7595e7aae0809a8e7392e89c39df0c955b1.tar.bz2
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 <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/Android.mk')
-rw-r--r--src/mesa/drivers/dri/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index d6196bb..8862953 100644
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -38,6 +38,7 @@ MESA_DRI_CFLAGS := \
-DHAVE_ANDROID_PLATFORM
MESA_DRI_C_INCLUDES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
$(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
$(DRM_TOP) \
$(DRM_TOP)/include/drm \
@@ -56,6 +57,9 @@ MESA_DRI_SHARED_LIBRARIES := \
libglapi \
liblog
+# All DRI modules must add this to LOCAL_GENERATED_SOURCES.
+MESA_DRI_OPTIONS_H := $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common)/xmlpool/options.h
+
#-----------------------------------------------
# Build drivers and libmesa_dri_common