summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2013-06-05 23:33:38 +0100
committerTom Stellard <thomas.stellard@amd.com>2013-10-01 07:29:50 -0700
commit38d80c01d0a00148989f84631707ade9dc52e8e3 (patch)
tree02770828e778077dd64b054d11915a663b60484a
parentd7c66ff59ef07abe85a2867f82326376f94386e3 (diff)
noop: consolidate C sources list into Makefile.sources
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
-rw-r--r--configure.ac1
-rw-r--r--src/gallium/drivers/Makefile.am13
-rw-r--r--src/gallium/drivers/noop/Makefile.am16
-rw-r--r--src/gallium/drivers/noop/Makefile.sources3
-rw-r--r--src/gallium/drivers/noop/SConscript8
5 files changed, 24 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index f88a0eeabae..899f20fc054 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2007,6 +2007,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/drivers/identity/Makefile
src/gallium/drivers/ilo/Makefile
src/gallium/drivers/llvmpipe/Makefile
+ src/gallium/drivers/noop/Makefile
src/gallium/drivers/nouveau/Makefile
src/gallium/drivers/r300/Makefile
src/gallium/drivers/r600/Makefile
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index c75fb82375d..3f7621d601b 100644
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -11,7 +11,7 @@ AM_CFLAGS = $(VISIBILITY_CFLAGS)
noinst_LTLIBRARIES =
-SUBDIRS = . identity trace rbug
+SUBDIRS = . identity noop trace rbug
################################################################################
@@ -24,17 +24,6 @@ galahad_libgalahad_la_SOURCES = \
################################################################################
-# Meta-driver which combines whichever software rasterizers have been
-# built into a single convenience library.
-
-noinst_LTLIBRARIES += noop/libnoop.la
-
-noop_libnoop_la_SOURCES = \
- noop/noop_pipe.c \
- noop/noop_state.c
-
-################################################################################
-
if HAVE_GALLIUM_R600
SUBDIRS += radeon
diff --git a/src/gallium/drivers/noop/Makefile.am b/src/gallium/drivers/noop/Makefile.am
new file mode 100644
index 00000000000..1f4ba028f7f
--- /dev/null
+++ b/src/gallium/drivers/noop/Makefile.am
@@ -0,0 +1,16 @@
+################################################################################
+
+# Meta-driver which combines whichever software rasterizers have been
+# built into a single convenience library.
+
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+ -I$(top_srcdir)/src/gallium/drivers \
+ $(GALLIUM_CFLAGS) \
+ $(VISIBILITY_CFLAGS)
+
+noinst_LTLIBRARIES = libnoop.la
+
+libnoop_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/noop/Makefile.sources b/src/gallium/drivers/noop/Makefile.sources
new file mode 100644
index 00000000000..916385e2d24
--- /dev/null
+++ b/src/gallium/drivers/noop/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+ noop_pipe.c \
+ noop_state.c
diff --git a/src/gallium/drivers/noop/SConscript b/src/gallium/drivers/noop/SConscript
index a4d0dcaf270..9cb2e29cbe3 100644
--- a/src/gallium/drivers/noop/SConscript
+++ b/src/gallium/drivers/noop/SConscript
@@ -7,9 +7,7 @@ env = env.Clone()
noop = env.ConvenienceLibrary(
target = 'noop',
- source = [
- 'noop_pipe.c',
- 'noop_state.c'
- ]
- ) + extra
+ source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+ ) + extra
+
Export('noop')