diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-09-17 15:58:29 +0100 |
---|---|---|
committer | Tom Stellard <thomas.stellard@amd.com> | 2013-10-01 07:29:49 -0700 |
commit | e11ff60e280083829a23cff7120eb932e26d0832 (patch) | |
tree | edb032b63286ce4dd1cad21759da3db1c024d1c4 /src/mesa/drivers/dri | |
parent | cb1febb074ca5a9d4674c953106b467f175c4c0f (diff) | |
download | external_mesa3d-e11ff60e280083829a23cff7120eb932e26d0832.zip external_mesa3d-e11ff60e280083829a23cff7120eb932e26d0832.tar.gz external_mesa3d-e11ff60e280083829a23cff7120eb932e26d0832.tar.bz2 |
mesa/drivers: drop HAVE_*_DRI from individual makefiles
The mesa/drivers/dri/Makefile.am already guards the individual
targets/subdirs with HAVE_*_DRI before including them. Thus making
the additional check within each Makefile.am unnecessary.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.am | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/nouveau/Makefile.am | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/Makefile.am | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/Makefile.am | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/swrast/Makefile.am | 3 |
6 files changed, 0 insertions, 19 deletions
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 46dd4c2..b07ad13 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -36,10 +36,7 @@ AM_CFLAGS = \ $(INTEL_CFLAGS) dridir = $(DRI_DRIVER_INSTALL_DIR) - -if HAVE_I915_DRI dri_LTLIBRARIES = i915_dri.la -endif i915_dri_la_SOURCES = $(i915_FILES) i915_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index eb437d3..71442dd 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -23,8 +23,6 @@ include Makefile.sources -if HAVE_I965_DRI - AM_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ \ @@ -85,5 +83,3 @@ test_eu_compact_LDADD = $(TEST_LIBS) all-local: i965_dri.la $(MKDIR_P) $(top_builddir)/$(LIB_DIR); ln -f .libs/i965_dri.so $(top_builddir)/$(LIB_DIR)/i965_dri.so; - -endif diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am index 7172e62..7e6605f 100644 --- a/src/mesa/drivers/dri/nouveau/Makefile.am +++ b/src/mesa/drivers/dri/nouveau/Makefile.am @@ -34,10 +34,7 @@ AM_CFLAGS = \ $(NOUVEAU_CFLAGS) dridir = $(DRI_DRIVER_INSTALL_DIR) - -if HAVE_NOUVEAU_DRI dri_LTLIBRARIES = nouveau_vieux_dri.la -endif nouveau_vieux_dri_la_SOURCES = \ $(NOUVEAU_C_FILES) diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am index fc0482a..6635265 100644 --- a/src/mesa/drivers/dri/r200/Makefile.am +++ b/src/mesa/drivers/dri/r200/Makefile.am @@ -37,10 +37,7 @@ AM_CFLAGS = \ $(RADEON_CFLAGS) dridir = $(DRI_DRIVER_INSTALL_DIR) - -if HAVE_R200_DRI dri_LTLIBRARIES = r200_dri.la -endif r200_dri_la_SOURCES = \ $(R200_C_FILES) diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am index d13b803..eaee1a8 100644 --- a/src/mesa/drivers/dri/radeon/Makefile.am +++ b/src/mesa/drivers/dri/radeon/Makefile.am @@ -37,10 +37,7 @@ AM_CFLAGS = \ $(RADEON_CFLAGS) dridir = $(DRI_DRIVER_INSTALL_DIR) - -if HAVE_RADEON_DRI dri_LTLIBRARIES = radeon_dri.la -endif radeon_dri_la_SOURCES = \ $(RADEON_C_FILES) diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am index fb9b8a0..9652583 100644 --- a/src/mesa/drivers/dri/swrast/Makefile.am +++ b/src/mesa/drivers/dri/swrast/Makefile.am @@ -34,10 +34,7 @@ AM_CFLAGS = \ $(VISIBILITY_CFLAGS) dridir = $(DRI_DRIVER_INSTALL_DIR) - -if HAVE_SWRAST_DRI dri_LTLIBRARIES = swrast_dri.la -endif swrast_dri_la_SOURCES = \ $(SWRAST_C_FILES) |