From e4580373a81894c451e5933b24906a075828b77e Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 30 May 2012 12:24:58 +0200
Subject: mesa xkeyboard-config git update 30 May 2012

---
 mesalib/src/mesa/Android.mk | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'mesalib/src/mesa/Android.mk')

diff --git a/mesalib/src/mesa/Android.mk b/mesalib/src/mesa/Android.mk
index f6c0f4e33..115db4703 100644
--- a/mesalib/src/mesa/Android.mk
+++ b/mesalib/src/mesa/Android.mk
@@ -26,11 +26,12 @@
 LOCAL_PATH := $(call my-dir)
 
 # Import the following variables:
-#     MESA_CXX_SOURCES
-#     MESA_GALLIUM_CXX_SOURCES
-#     MESA_GALLIUM_SOURCES
-#     MESA_SOURCES
-#     X86_SOURCES
+#     MESA_CXX_FILES
+#     MESA_GALLIUM_CXX_FILES
+#     MESA_GALLIUM_FILES
+#     MESA_FILES
+#     X86_FILES
+SRCDIR = .
 include $(LOCAL_PATH)/sources.mak
 
 common_CFLAGS := \
@@ -49,7 +50,7 @@ common_ASM :=
 
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
-common_ASM += $(X86_SOURCES)
+common_ASM += $(X86_FILES)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := x86/gen_matypes.c
@@ -71,8 +72,8 @@ ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-	$(MESA_GALLIUM_SOURCES) \
-	$(MESA_GALLIUM_CXX_SOURCES) \
+	$(MESA_GALLIUM_FILES) \
+	$(MESA_GALLIUM_CXX_FILES) \
 	$(common_ASM)
 
 LOCAL_CFLAGS := $(common_CFLAGS)
@@ -108,8 +109,8 @@ LOCAL_C_INCLUDES := \
 	$(common_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
-        $(MESA_SOURCES) \
-        $(MESA_CXX_SOURCES) \
+        $(MESA_FILES) \
+        $(MESA_CXX_FILES) \
         $(common_ASM)
 
 include $(LOCAL_PATH)/Android.gen.mk
-- 
cgit v1.2.3