Re: Remove conf/*.mk from svn

[Christian Franke <Christian.Franke@t-online.de>]

Colin D Bennett wrote:
> On Thu, 24 Jul 2008 22:17:06 -0700 (PDT)
> Viswesh S <...> wrote:
>
>   
>> I have modified the conf/common.mk accordingly as shown below.
>>     
>
> GRUB developers,
>
> I think we should remove conf/*.mk from the Subversion repository.  If
> people are going to be developing on GRUB and checking out svn
> branches, then I think it's fine to require them to have Ruby.  For
> released tarballs that we expect non-developers to use, we just need to
> generate the *.mk files and include them in the tarball.
>
> What is the benefit of having conf/*.mk files in svn?  They cause lots
> of merge conflicts: sure, the conflicts are easy to resolve by simply
> choosing to take one of the revisions, but then that merge really has
> not meaning, since it won't be in sync with your .rmk file until it's
> once again regenerated and checked in.
>
> Removing the autogenerated .mk files would also eliminate problems new
> developers like Viswesh and I have encountered -- we won't be tempted
> to modify a non-versioned file like this.
>
>   

I agree, the files generated by ./autogen.sh should be included in 
tarball, but not in the repo.
Additional prerequisites (autoconf, ruby) for builds from svn are IMO OK.

In my local grub2 git repo, these files are excluded:
configure
config.h.in
stamp-h.in
conf/*.mk

BTW: autogen.sh should "touch stamp-h.in" to be consistent with the 
Makefile rule for config.h.in.

Christian