summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2013-09-22 16:33:52 +0100
committerTom Stellard <[email protected]>2013-10-01 07:29:52 -0700
commit5d7690991ab211a09ecf49e49f8a6e5d261fa540 (patch)
treee3a0b60a5677ea1fae3021164e67c6e30c7baf10
parent0d36f5c3be59c9357916097b6f328ac13b0eca77 (diff)
winsys/nouveau/drm: consolidate C sources list into Makefile.sources
Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Tom Stellard <[email protected]>
-rw-r--r--src/gallium/winsys/nouveau/drm/Android.mk4
-rw-r--r--src/gallium/winsys/nouveau/drm/Makefile.am3
-rw-r--r--src/gallium/winsys/nouveau/drm/Makefile.sources2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/winsys/nouveau/drm/Android.mk b/src/gallium/winsys/nouveau/drm/Android.mk
index 93c540bcaee..2e2a9d12d36 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 14488779b9d..f9645f56944 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 00000000000..43b8e8679ac
--- /dev/null
+++ b/src/gallium/winsys/nouveau/drm/Makefile.sources
@@ -0,0 +1,2 @@
+C_SOURCES := \
+ nouveau_drm_winsys.c