diff options
| author | Carl Worth <[email protected]> | 2012-12-03 15:43:19 -0800 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2013-01-11 13:54:54 -0800 |
| commit | b587a7595e7aae0809a8e7392e89c39df0c955b1 (patch) | |
| tree | cf73d53420456623ec9974cc9ee52e5ee04b07bc /src/mesa/drivers/dri/Android.mk | |
| parent | 8888c6f8e50f3e5e316d2f41556162bec9a685d4 (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/Android.mk')
| -rw-r--r-- | src/mesa/drivers/dri/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index d6196bb4326..88629531a9d 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 |