On 09/22/2013 01:29 PM, Emil Velikov wrote: > 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.veli...@gmail.com> > --- > 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 978917c..1f4b21e 100644 > --- a/src/mesa/drivers/dri/i915/Makefile.am > +++ b/src/mesa/drivers/dri/i915/Makefile.am > @@ -46,10 +46,7 @@ AM_CFLAGS += \ > endif > > 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 = -module -avoid-version -shared > diff --git a/src/mesa/drivers/dri/i965/Makefile.am > b/src/mesa/drivers/dri/i965/Makefile.am > index 27c67d1..04fa011 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/ \ > @@ -95,5 +93,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 2b47f75..2723ce7 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 4357922..950ac9d 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 43de059..56afd7e 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 d3da196..de160ed 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) >
Nice! Patch 2 is: Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> I don't plan on looking at the rest of the series. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev