[FFmpeg-cvslog] build: Remove redundant config.mak includes from subdirectory Makefiles.

[Michael Niedermayer]

On Sun, Jun 26, 2011 at 01:33:11PM +0200, Reimar Döffinger wrote:
> On Sun, Jun 26, 2011 at 01:22:07PM +0200, Stefano Sabatini wrote:
> > On date Sunday 2011-06-26 09:40:46 +0200, Reimar Döffinger wrote:
> > > On Sun, Jun 26, 2011 at 02:39:26AM +0200, Diego Biurrun wrote:
> > > > ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jun 25 00:19:39 2011 +0200| [a6213f3dce4006e0d47bd938e15832987d95efef] | committer: Diego Biurrun
> > > > 
> > > > build: Remove redundant config.mak includes from subdirectory Makefiles.
> > > > 
> > > > Calling Make from subdirectories is not supported and config.mak has
> > > > multiple inclusion guards anyway, so the top-level include is enough.
> > > 
> > 
> > > Am I really the only one who cares about this feature?
> > > I don't mind maintaining it, however if such obviously breaking changes
> > > get merged immediately and it'll end up broken most of the time, plus
> > > with git revert not properly working reverting it is far more effort
> > > than not merging it feels like it will be nothing more than a waste
> > > of time...
> > 
> > I care about the "calling make from subdirectories" feature, and I
> > honestly have no idea why it was removed in the first place (but I see
> > there is a tendency to oversimplify things there).
> 
> Ok. I do understand it to some degree, it involves some ugliness
> but I'd consider it acceptable.
> I admit I've never done git merges so I also want to apologize to
> Michael in case it seems like I attacked him, it's just that the
> "merge and then revert" workflow is extra work and error-prone
> so I just would prefer to avoid it.

i appologize for missing the issues merging this caused.

The root problem is that these commits happen in libav in the first
place. Such changes should not pass peer review there.

If you spot such issues before i do a merge, you can mail me and
ask me to exclude the problematic commits.
If noone tells me and i dont realize the problem, then reverting is
the obvious option left and this may need a bit of manual care
sometimes.

One alternative would be that someone could just maintain the
buildsystem in a branch that is branched of ffmpeg. And i could
just merge from that branch.
It wouldnt solve the need to revert bad commite that leak into main
ffmpeg but it would keep that branch free of such bad commits.

Other suggestions are very welcome of course.

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many things microsoft did are stupid, but not doing something just because
microsoft did it is even more stupid. If everything ms did were stupid they
would be bankrupt already.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20110629/ba19366d/attachment.asc>