From 5d7690991ab211a09ecf49e49f8a6e5d261fa540 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 22 Sep 2013 16:33:52 +0100 Subject: [PATCH] winsys/nouveau/drm: consolidate C sources list into Makefile.sources Signed-off-by: Emil Velikov Reviewed-by: Tom Stellard --- 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 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