diff options
| author | Eric Anholt <eric@anholt.net> | 2012-11-07 16:33:39 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-11-12 15:52:42 -0800 |
| commit | 907844107252260c646aca361191ef7f121f3d23 (patch) | |
| tree | cf9a5a54b804e852344541a096992943687e2a6a /src/mesa/Android.libmesa_st_mesa.mk | |
| parent | 0ef85357479a47c2bdd05df3b2183bc7bfa0ac6e (diff) | |
automake,android: Build program/ into a helper lib (v2)
While simplifying mesa/Makefile.am, the more important feature of this commit
is allowing a file with the same name to appear in both main/ and program/.
v2: [chadv] Add changes to Android makefiles.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
Signed-off-by: Chad Versace <chad.versace@linux.intel.com> (v2)
Diffstat (limited to 'src/mesa/Android.libmesa_st_mesa.mk')
| -rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index a0621e35231..79914caf17e 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -49,11 +49,15 @@ endif # x86 endif # MESA_ENABLE_ASM LOCAL_C_INCLUDES := \ + $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ $(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/mapi +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_program + include $(LOCAL_PATH)/Android.gen.mk include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |