Hi Hakan,
Thanks for looking at the patch. I agree with your comment that it will
be better to put these two file names on two separate lines. I will make
an updated patch that do this.
The main reason that I put these on the same line is that they "belong
together". The .h file is the header file for the .il assembly code file.
Olav
Hakan Kuecuekyilmaz wrote:
> Olav,
>
> I agree on that the *.il is kind of a include file and it fits to the
> falcon_headers section.
>
> On So, 2008-12-07 at 11:29 +0100, Olav.Sandstaa@stripped wrote:
>
>> #At file:///home/olav/mysql/develop/dist-test/
>>
>> 2927 Olav.Sandstaa@stripped 2008-12-07
>> Follow-up to patch for Bug#37622 Falcon does not compile on Solaris 9 on
> SPARC using Sun Studio compiler.
>>
>> Adds the two new include files to the Falcon make file in order to get them
> included when building
>> the source distribution.
>> modified:
>> storage/falcon/Makefile.am
>>
>> per-file messages:
>> storage/falcon/Makefile.am
>> Add two new include files.
>> === modified file 'storage/falcon/Makefile.am'
>> --- a/storage/falcon/Makefile.am 2008-10-20 09:16:47 +0000
>> +++ b/storage/falcon/Makefile.am 2008-12-07 10:29:08 +0000
>> @@ -37,6 +37,7 @@ falcon_headers= Agent.h Alias.h Applicat
>> CollationUnknown.h \
>> Collation.h \
>> CollationManager.h \
>> + CompareAndSwapSparc.h CompareAndSwapSparc.il \
>>
>
> I would prefer to have each file on separate lines. I am suggesting this
> because of easier future merges. Think of a future change, which would
> involve a merge:
>
> Change A:
> - CompareAndSwapSparc.h CompareAndSwapSparc.il \
> + CompareAndSwapAllSparc.h CompareAndSwapSparc.il \
>
> Change B:
> - CompareAndSwapSparc.h CompareAndSwapSparc.il \
> + CompareAndSwapSparc.h CompareAndSwapAllSparc.il \
>
> Now when we try to merge changes A and B, we would get a conflict.
> Having every include file on a single line avoids such a situation:
>
> Change A:
> - CompareAndSwapSparc.h \
> + CompareAndSwapAllSparc.h \
>
> Change B:
> - CompareAndSwapSparc.il \
> + CompareAndSwapAllSparc.il \
>
> Brian Aker blogged about this a while ago in more detail:
> "Coding Habits, What is on my mind while compiles are happening..."
> http://krow.livejournal.com/558188.html
>
>
> Best regards,
>
> Hakan
>
>
>
