[Mesa-dev] [PATCH 27/29] winsys/nouveau/drm: consolidate C sources list into Makefile.sources

Emil Velikov emil.l.velikov at gmail.com
Sun Sep 22 13:29:50 PDT 2013


Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/winsys/nouveau/drm/Android.mk       | 4 ++--
 src/gallium/winsys/nouveau/drm/Makefile.am      | 3 ++-
 src/gallium/winsys/nouveau/drm/Makefile.sources | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 src/gallium/winsys/nouveau/drm/Makefile.sources

diff --git a/src/gallium/winsys/nouveau/drm/Android.mk b/src/gallium/winsys/nouveau/drm/Android.mk
index 93c540b..2e2a9d1 100644
--- a/src/gallium/winsys/nouveau/drm/Android.mk
+++ b/src/gallium/winsys/nouveau/drm/Android.mk
@@ -23,8 +23,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# from Makefile
-C_SOURCES = nouveau_drm_winsys.c
+# get C_SOURCES
+include $(LOCAL_PATH)/Makefile.sources
 
 include $(CLEAR_VARS)
 
diff --git a/src/gallium/winsys/nouveau/drm/Makefile.am b/src/gallium/winsys/nouveau/drm/Makefile.am
index 1448877..f9645f5 100644
--- a/src/gallium/winsys/nouveau/drm/Makefile.am
+++ b/src/gallium/winsys/nouveau/drm/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -30,4 +31,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libnouveaudrm.la
 
-libnouveaudrm_la_SOURCES = nouveau_drm_winsys.c
+libnouveaudrm_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/nouveau/drm/Makefile.sources b/src/gallium/winsys/nouveau/drm/Makefile.sources
new file mode 100644
index 0000000..43b8e86
--- /dev/null
+++ b/src/gallium/winsys/nouveau/drm/Makefile.sources
@@ -0,0 +1,2 @@
+C_SOURCES := \
+	nouveau_drm_winsys.c
-- 
1.8.4



More information about the mesa-dev mailing list