[Mesa-dev] [PATCH v2 2/9] gbm: split out source file to Makefile.sources

Rob Herring robh at kernel.org
Wed May 4 02:02:40 UTC 2016


In preparation to add Android build support, split out the source file
lists to Makefile.sources

Signed-off-by: Rob Herring <robh at kernel.org>
---
v2:
- fix missing Makefile.sources include
- remove spurious whitespace change

 src/gbm/Makefile.am      | 12 ++++--------
 src/gbm/Makefile.sources | 12 ++++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 src/gbm/Makefile.sources

diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index 9ec6ea0..45fb762 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -1,3 +1,5 @@
+include Makefile.sources
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = main/gbm.pc

@@ -15,12 +17,7 @@ lib_LTLIBRARIES = libgbm.la
 include_HEADERS = main/gbm.h

 libgbm_la_SOURCES = \
-	main/backend.c \
-	main/backend.h \
-	main/common_drm.h \
-	main/gbm.c \
-	main/gbm.h \
-	main/gbmint.h
+	$(gbm_core_FILES)

 libgbm_la_LDFLAGS = \
 	-no-undefined \
@@ -40,8 +37,7 @@ endif

 if HAVE_DRI2
 libgbm_la_SOURCES += \
-	backends/dri/gbm_dri.c \
-	backends/dri/gbm_driint.h
+	$(gbm_dri_FILES)

 AM_CFLAGS += \
 	-DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \
diff --git a/src/gbm/Makefile.sources b/src/gbm/Makefile.sources
new file mode 100644
index 0000000..acb3536
--- /dev/null
+++ b/src/gbm/Makefile.sources
@@ -0,0 +1,12 @@
+
+gbm_core_FILES = \
+	main/backend.c \
+	main/backend.h \
+	main/common_drm.h \
+	main/gbm.c \
+	main/gbm.h \
+	main/gbmint.h
+
+gbm_dri_FILES = \
+	backends/dri/gbm_dri.c \
+	backends/dri/gbm_driint.h
--
2.7.4



More information about the mesa-dev mailing list