From 907844107252260c646aca361191ef7f121f3d23 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 7 Nov 2012 16:33:39 -0800 Subject: 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 (v1) Signed-off-by: Chad Versace (v2) --- src/mesa/Android.libmesa_dricore.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/mesa/Android.libmesa_dricore.mk') diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index 48a37a1..093d7a1 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -53,9 +53,13 @@ LOCAL_CFLAGS := \ $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS)) LOCAL_C_INCLUDES := \ + $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/glsl +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_program + include $(LOCAL_PATH)/Android.gen.mk include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) -- cgit v1.1