[Ffmpeg-devel] Makefile consolidation
Michael Niedermayer
michaelni
Mon Feb 13 12:17:41 CET 2006
Hi
On Mon, Feb 13, 2006 at 11:00:58AM -0000, M?ns Rullg?rd wrote:
>
> Diego Biurrun said:
> > On Mon, Feb 13, 2006 at 12:18:56AM +0000, M?ns Rullg?rd wrote:
> >> M?ns Rullg?rd <mru at inprovide.com> writes:
> >>
> >> > Diego Biurrun <diego at biurrun.de> writes:
> >> >
> >> >> Good. Will you commit the patch?
> >> >>
> >> >> I'm fine with seeing this committed. I'll have to adapt the MPlayer
> >> >> build, though ...
> >> >
> >> > OK, I'll commit it shortly.
> >>
> >> The style checker is shouting at me about tabs in common.mak. Would
> >> you please change it to allow tabs in *.mak as well as Makefile? I'd
> >> do it myself, but seeing how many attempts it took to get it right in
> >> the first place I'm afraid I'll break something.
> >
> > Nah, the trouble was just with the different CVS versions on mphq and my
> > machine. But having a shell on mphq, this is much easier for me to
> > test.
> >
> > Fixed. Go ahead and commit.
>
> It's still complaining about tabs in common.mak.
i think follwoing should fix it ...
-FILELIST="`echo $FILELIST | sed 's/Makefile\|common.mak\|clean-diff//'`"
+FILELIST="`echo $FILELIST | sed 's/Makefile\|common.mak\|clean-diff\|style.sh//g'`"
but
Tabs found in style.sh.
Commit aborted, fix the issue and try again.
ideg ....
should i remove the tab check, first, fix style.sh and then add it
back later ... ?
[...]
--
Michael
More information about the ffmpeg-devel
mailing list