diff options
| author | Emil Velikov <[email protected]> | 2014-05-10 14:35:08 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-05-15 17:32:30 +0100 |
| commit | d812c745829be2155fdd0d10e4a12606c2a10826 (patch) | |
| tree | 21177e54bb2eb6676774ca478b153b80276f6014 /src/gallium/drivers | |
| parent | 6fcc0b0ba5b5a554682b782ee5f7930d7aabbe8e (diff) | |
gallium/radeon: link in libradeon.la at target level
It makes more sense to link the core and common parts of the driver as the
target is build. Additionally this will help us drop duplicating symbols
for targets that static link mulitple pipe-drivers. Only egl-static needs
that currently with more to come.
To simplify things a bit add HAVE_GALLIUM_RADEON_COMMON variable.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/Makefile.am | 24 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Makefile.am | 2 |
3 files changed, 8 insertions, 20 deletions
diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am index f8baa3cf92c..3d53cade7b8 100644 --- a/src/gallium/drivers/Makefile.am +++ b/src/gallium/drivers/Makefile.am @@ -5,22 +5,6 @@ SUBDIRS = . galahad identity noop trace rbug ################################################################################ -if HAVE_GALLIUM_R600 - -SUBDIRS += radeon - -else - -if HAVE_GALLIUM_RADEONSI - -SUBDIRS += radeon - -endif - -endif - -################################################################################ - if HAVE_GALLIUM_FREEDRENO SUBDIRS += freedreno @@ -61,6 +45,14 @@ endif ################################################################################ +if HAVE_GALLIUM_RADEON_COMMON + +SUBDIRS += radeon + +endif + +################################################################################ + if HAVE_GALLIUM_R300 SUBDIRS += r300 diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am index be8635d26e2..30e098e1770 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -17,8 +17,6 @@ libr600_la_SOURCES = \ $(C_SOURCES) \ $(CXX_SOURCES) -libr600_la_LIBADD = ../radeon/libradeon.la - if NEED_RADEON_LLVM AM_CFLAGS += \ diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am index f409f7e3bc4..926b2032c8a 100644 --- a/src/gallium/drivers/radeonsi/Makefile.am +++ b/src/gallium/drivers/radeonsi/Makefile.am @@ -32,5 +32,3 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libradeonsi.la libradeonsi_la_SOURCES = $(C_SOURCES) -libradeonsi_la_LIBADD = \ - ../radeon/libradeon.la |