diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-06-05 23:28:11 +0100 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-10-01 07:29:50 -0700 |
| commit | d7c66ff59ef07abe85a2867f82326376f94386e3 (patch) | |
| tree | 372a80b57ab321302e93dd7c7f32b3e00411e6bd /src | |
| parent | 959ed5c1636441cbd4dfb720e3d57e0a03bd9992 (diff) | |
identity: 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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/Makefile.am | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/identity/Makefile.am | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/identity/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/identity/SConscript | 7 |
4 files changed, 18 insertions, 15 deletions
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am index 171d102dad8..c75fb82375d 100644 --- a/src/gallium/drivers/Makefile.am +++ b/src/gallium/drivers/Makefile.am @@ -11,7 +11,7 @@ AM_CFLAGS = $(VISIBILITY_CFLAGS) noinst_LTLIBRARIES = -SUBDIRS = . trace rbug +SUBDIRS = . identity trace rbug ################################################################################ @@ -24,15 +24,6 @@ galahad_libgalahad_la_SOURCES = \ ################################################################################ -noinst_LTLIBRARIES += identity/libidentity.la - -identity_libidentity_la_SOURCES = \ - identity/id_objects.c \ - identity/id_context.c \ - identity/id_screen.c - -################################################################################ - # Meta-driver which combines whichever software rasterizers have been # built into a single convenience library. diff --git a/src/gallium/drivers/identity/Makefile.am b/src/gallium/drivers/identity/Makefile.am new file mode 100644 index 00000000000..1caf3286a4c --- /dev/null +++ b/src/gallium/drivers/identity/Makefile.am @@ -0,0 +1,11 @@ +include Makefile.sources +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ + $(GALLIUM_CFLAGS) \ + $(VISIBILITY_CFLAGS) + +noinst_LTLIBRARIES = libidentity.la + +libidentity_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/identity/Makefile.sources b/src/gallium/drivers/identity/Makefile.sources new file mode 100644 index 00000000000..14351e0e8d8 --- /dev/null +++ b/src/gallium/drivers/identity/Makefile.sources @@ -0,0 +1,4 @@ +C_SOURCES := \ + id_objects.c \ + id_context.c \ + id_screen.c diff --git a/src/gallium/drivers/identity/SConscript b/src/gallium/drivers/identity/SConscript index d24d1ec7c61..120995143d2 100644 --- a/src/gallium/drivers/identity/SConscript +++ b/src/gallium/drivers/identity/SConscript @@ -4,11 +4,8 @@ env = env.Clone() identity = env.ConvenienceLibrary( target = 'identity', - source = [ - 'id_context.c', - 'id_objects.c', - 'id_screen.c', - ]) + source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') + ) env.Alias('identity', identity) |