diff options
| author | Emil Velikov <[email protected]> | 2015-10-17 21:14:09 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-11-21 12:52:19 +0000 |
| commit | 950e06a29bd664af0cb454fc2f35f8cc4153e7f1 (patch) | |
| tree | 5a5ffd6d182c1fbde2900fac4aecae348c1ba177 /src | |
| parent | be78f73b37caa5c9bc8dec9390d0c397bbff8729 (diff) | |
automake: remove no longer needed HAVE_LOADER_GALLIUM conditional
As of last few commits we have a static and dynamic pipe-loader. Either
of which will be used with (almost) all targets..
We can look into allowing the user to select which way the targets are
built, be that 'static for all' or 'per target' in follow up commits.
After which we can look into building only the static or dynamic
version, although building both shouldn't cause any issues.
Hack/workaround alert:
Control the standalone pipe-drivers via HAVE_CLOVER. Will need to be
fixed as the targets are converted/configure knobs are in.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Rob Clark <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index 2c7508385ca..e42a8f17703 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -5,6 +5,7 @@ SUBDIRS = ## SUBDIRS += auxiliary +SUBDIRS += auxiliary/pipe-loader ## ## Gallium pipe drivers and their respective winsys' @@ -120,7 +121,8 @@ EXTRA_DIST = \ ## Gallium state trackers and their users (targets) ## -if HAVE_LOADER_GALLIUM +## XXX: Rename the conditional once we have a config switch for static/dynamic pipe-drivers +if HAVE_CLOVER SUBDIRS += targets/pipe-loader endif diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 0908608d2db..7ff8972f8c0 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -1,7 +1,3 @@ -if HAVE_LOADER_GALLIUM -SUBDIRS := pipe-loader -endif - include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc |