From e11ff60e280083829a23cff7120eb932e26d0832 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 17 Sep 2013 15:58:29 +0100 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i915/Makefile.am | 3 --- src/mesa/drivers/dri/i965/Makefile.am | 4 ---- src/mesa/drivers/dri/nouveau/Makefile.am | 3 --- src/mesa/drivers/dri/r200/Makefile.am | 3 --- src/mesa/drivers/dri/radeon/Makefile.am | 3 --- src/mesa/drivers/dri/swrast/Makefile.am | 3 --- 6 files changed, 19 deletions(-) diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 46dd4c27756..b07ad138798 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 eb437d31645..71442dd9a64 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 7172e62558c..7e6605f29c5 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 fc0482a6ee7..6635265ea54 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 d13b803aecc..eaee1a88d25 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 fb9b8a05072..9652583f2ca 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) -- 2.30.2