[Mesa-dev] [PATCH 8/9] compiler: android: flesh out nir into separate makefile

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/compiler/Android.mk                            | 25 ++--------------------
 .../{Android.gen.mk => Android.nir.gen.mk}         |  0
 src/{loader/Android.mk => compiler/Android.nir.mk} | 21 ++++++++++--------
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/compiler/Android.mk b/src/compiler/Android.mk
index 6c3a855..ac0ced5 100644
--- a/src/compiler/Android.mk
+++ b/src/compiler/Android.mk
@@ -43,27 +43,6 @@ LOCAL_MODULE := libmesa_compiler
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
-# ---------------------------------------
-# Build libmesa_nir
-# ---------------------------------------
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	$(NIR_FILES)
-
-LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/src/mapi \
-	$(MESA_TOP)/src/mesa \
-	$(MESA_TOP)/src/gallium/include \
-	$(MESA_TOP)/src/gallium/auxiliary
-
-LOCAL_STATIC_LIBRARIES := libmesa_compiler
-
-LOCAL_MODULE := libmesa_nir
-
-include $(LOCAL_PATH)/Android.gen.mk
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
 include $(LOCAL_PATH)/Android.glsl.mk
+
+include $(LOCAL_PATH)/Android.nir.mk
diff --git a/src/compiler/Android.gen.mk b/src/compiler/Android.nir.gen.mk
similarity index 100%
rename from src/compiler/Android.gen.mk
rename to src/compiler/Android.nir.gen.mk
diff --git a/src/loader/Android.mk b/src/compiler/Android.nir.mk
similarity index 80%
copy from src/loader/Android.mk
copy to src/compiler/Android.nir.mk
index 8690565..e89a21c 100644
--- a/src/loader/Android.mk
+++ b/src/compiler/Android.nir.mk
@@ -1,6 +1,6 @@
 # Mesa 3-D graphics library
 #
-# Copyright (C) 2014 Emil Velikov <emil.l.velikov at gmail.com>
+# Copyright (C) 2015 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -25,22 +25,25 @@ LOCAL_PATH := $(call my-dir)
 include $(LOCAL_PATH)/Makefile.sources
 
 # ---------------------------------------
-# Build libmesa_loader
+# Build libmesa_nir
 # ---------------------------------------
 
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-	$(LOADER_C_FILES)
+	$(NIR_FILES)
 
-ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
-LOCAL_CFLAGS += -DHAVE_LIBDRM
-LOCAL_SHARED_LIBRARIES := libdrm
-endif
+LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/mapi \
+	$(MESA_TOP)/src/mesa \
+	$(MESA_TOP)/src/gallium/include \
+	$(MESA_TOP)/src/gallium/auxiliary
 
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_STATIC_LIBRARIES := libmesa_compiler
 
-LOCAL_MODULE := libmesa_loader
+LOCAL_MODULE := libmesa_nir
 
+include $(LOCAL_PATH)/Android.nir.gen.mk
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
+
-- 
2.8.0