On Mon, Feb 1, 2016 at 1:11 PM, Matt Turner <matts...@gmail.com> wrote: > On Sun, Jan 31, 2016 at 2:27 AM, Emil Velikov <emil.l.veli...@gmail.com> > wrote: >> On 30 January 2016 at 23:03, Rob Clark <robdcl...@gmail.com> wrote: >>> On Sat, Jan 30, 2016 at 3:38 PM, Rob Herring <r...@kernel.org> wrote: >>>> On Sat, Jan 30, 2016 at 2:06 PM, Rob Clark <robdcl...@gmail.com> wrote: >>>>> From: Rob Clark <robcl...@freedesktop.org> >>>>> >>>>> We seem to end up w/ duplication between compiler/Makefile.sources and >>>>> compiler/glsl/Makefile.sources. The latter appears unused. Delete it. >>>> >>>> The fixes for Android I sent yesterday use it. But at least the nir/* >>>> files could be removed. >>> >>> oh.. hmm.. is it possible for android to use the same >>> compiler/Makefile.sources? Or is this just a temporary situation? >>> >> It's aimed as temporary solution. I'm planning to rework that real soon (tm). >> >>> I'm adding new src files and bit confusing at the moment to know which >>> places to update.. >>> >> Sorry about that. Please update both places, alternatively we'll fix >> thing it when needed. > > Why are things like they are now? What is using nir/Makefile.sources > or glsl/Makefile.sources? glsl/Makefile.am looks plainly dead. > > Leaving these file in place is *mean*. Rebasing patches that touch > them onto these changes will update the wrong files.
that is exactly the scenario that I hit.. at first I thought some makefile hunks got lost when rebasing, but they appeared exactly where you'd think they should be if your are looking at the rebased patch. BR, -R _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev